diff --git a/ChangeLog b/ChangeLog index b3f65d8..e7c5d9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +=== RELEASE 2.28 === + +Sat Sep 17 21:54:44 CEST 2022 mikulas: + + Disable cache when following redirects from consent.google.com + +Sat Sep 10 16:05:02 CEST 2022 mikulas: + + On Windows, change the default directory to the "Downloads" directory, + so that downloaded files are placed there + +Sat Sep 10 15:31:20 CEST 2022 mikulas: + + Compile the 32-bit Windows version without SSE2 instructions + +Tue May 31 21:07:51 CEST 2022 mikulas: + + Fix a display glitch on framebuffer, if the user doesn't have mouse and + if he presses F5, F6, F7 or F8 + === RELEASE 2.27 === Fri May 27 20:10:59 CEST 2022 mikulas: diff --git a/INSTALL b/INSTALL index bd0136d..9ced69f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Links 2.27 -- How To Install +Links 2.28 -- How To Install ---------------------------- Follow this step-by-step: diff --git a/Makefile.in b/Makefile.in index a64da53..659cba8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -103,11 +103,11 @@ img.o imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o \ mailto.o main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o \ sched.o select.o session.o smb.o string.o suffix.o svg.o svgalib.o \ terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o -@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o -@HAIKU_GR_TRUE@links_DEPENDENCIES = haiku.o @JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \ @JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \ @JAVASCRIPT_TRUE@regexp.o +@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o +@HAIKU_GR_TRUE@links_DEPENDENCIES = haiku.o links_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/config-vms.h b/config-vms.h index bb043aa..69a1857 100644 --- a/config-vms.h +++ b/config-vms.h @@ -934,11 +934,11 @@ #define PACKAGE "links" /* Version number of package */ -#define VERSION "2.27" +#define VERSION "2.28" /* */ -#define VERSION "2.27" +#define VERSION "2.28" /* */ /* #undef HAVE_OPENMP */ diff --git a/configure b/configure index e2afdb0..ac5a1b3 100755 --- a/configure +++ b/configure @@ -771,7 +771,7 @@ fi PACKAGE=links -VERSION=2.27 +VERSION=2.28 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff --git a/configure.in b/configure.in index 8de2531..78313af 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(main.c) -AM_INIT_AUTOMAKE(links, 2.27) +AM_INIT_AUTOMAKE(links, 2.28) ACLOCAL="./missing aclocal" AUTOCONF="./missing autoconf" diff --git a/default.c b/default.c index 7f241ac..caf7b2e 100644 --- a/default.c +++ b/default.c @@ -717,42 +717,39 @@ static unsigned char *get_home(int *n) { struct stat st; int rs; + unsigned char *p; unsigned char *home; unsigned char *home_links; unsigned char *config_dir; EINTRLOOP(rs, stat(".", &st)); - if (rs && (home = cast_uchar getenv("HOME"))) - EINTRLOOP(rs, chdir(cast_const_char home)); + if (rs && (p = cast_uchar getenv("HOME"))) + EINTRLOOP(rs, chdir(cast_const_char p)); home = NULL; config_dir = stracpy(cast_uchar getenv("CONFIG_DIR")); if (n) *n = 1; #ifdef WIN +#ifdef WINDOWS_RELEASE + if ((p = cast_uchar getenv("USERPROFILE"))) { + p = stracpy(p); + translate_win32_to_unix(&p); + EINTRLOOP(rs, chdir(cast_const_char p)); + mem_free(p); + if (!rs) + EINTRLOOP(rs, chdir("Downloads")); + } +#endif if (!home) { home = stracpy(cast_uchar getenv("APPDATA")); -#ifdef HAVE_CYGWIN_CONV_PATH /* * Newer Cygwin complains about windows-style path, so * we have to convert it. */ if (home) { - unsigned char *new_path; - ssize_t sz = cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, home, NULL, 0); - if (sz < 0 || sz >= MAXINT) - goto skip_path_conv; - new_path = mem_alloc(sz); - sz = cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, home, new_path, sz); - if (sz < 0) { - mem_free(new_path); - goto skip_path_conv; - } - mem_free(home); - home = new_path; -skip_path_conv:; + translate_win32_to_unix(&home); } -#endif if (home) { EINTRLOOP(rs, stat(cast_const_char home, &st)); if (rs || !S_ISDIR(st.st_mode)) { diff --git a/fontconf.c b/fontconf.c index 2962af9..4a6f74f 100644 --- a/fontconf.c +++ b/fontconf.c @@ -14,24 +14,17 @@ #include static void set_font_path(void) { - unsigned char *path = cast_uchar "/cygdrive/c/Windows/Fonts"; + unsigned char *path = stracpy(cast_uchar "/cygdrive/c/Windows/Fonts"); #if defined(HAVE_CYGWIN_CONV_PATH) unsigned char win32_path[MAX_PATH]; if (SHGetFolderPathA(NULL, CSIDL_FONTS, NULL, 0, cast_char win32_path) == S_OK) { - ssize_t l; - unsigned char *cyg_path; - l = cygwin_conv_path(CCP_WIN_A_TO_POSIX, win32_path, NULL, 0); - if (l <= 0) - goto do_default; - cyg_path = alloca(l); - l = cygwin_conv_path(CCP_WIN_A_TO_POSIX, win32_path, cyg_path, l); - if (l < 0) - goto do_default; - path = cyg_path; + mem_free(path); + path = stracpy(win32_path); + translate_win32_to_unix(&path); } - do_default: #endif FcConfigAppFontAddDir(NULL, path); + mem_free(path); } #else #define set_font_path() do { } while (0) diff --git a/framebuf.c b/framebuf.c index 6d5a3b8..7395170 100644 --- a/framebuf.c +++ b/framebuf.c @@ -279,6 +279,10 @@ static void redraw_mouse(void); static void fb_mouse_move(int dx, int dy) { struct links_event ev; + + if (!fb_have_mouse) + return; + mouse_x += dx; mouse_y += dy; ev.ev = EV_MOUSE; diff --git a/links.h b/links.h index 855759d..fa25835 100644 --- a/links.h +++ b/links.h @@ -1042,6 +1042,9 @@ void init_os(void); void init_os_terminal(void); void get_path_to_exe(void); int os_get_system_name(unsigned char *buffer); +#ifdef WIN +void translate_win32_to_unix(unsigned char **str); +#endif unsigned char *os_conv_to_external_path(unsigned char *, unsigned char *); unsigned char *os_fixup_external_program(unsigned char *); int exe(unsigned char *, int); diff --git a/links.wis b/links.wis index e8f6689..19b0ea1 100644 --- a/links.wis +++ b/links.wis @@ -1,7 +1,7 @@ ce && rq->state == O_WAITING && stat->ce->redirect) { if (rq->redirect_cnt++ < MAX_REDIRECTS) { int cache, allow_flags; - unsigned char *u, *pos; + unsigned char *u, *pos, *url_host; change_connection(stat, NULL, PRI_CANCEL); u = join_urls(rq->url, stat->ce->redirect); if ((pos = extract_position(u))) { @@ -364,7 +364,15 @@ static void objreq_end(struct status *stat, void *data) rq->goto_position = pos; } cache = rq->cache; - if (cache < NC_RELOAD && (!strcmp(cast_const_char u, cast_const_char rq->url) || !strcmp(cast_const_char u, cast_const_char rq->orig_url) || rq->redirect_cnt >= MAX_CACHED_REDIRECTS)) cache = NC_RELOAD; + url_host = get_host_name(rq->url); + if (cache < NC_RELOAD && + (!strcmp(cast_const_char u, cast_const_char rq->url) || + !strcmp(cast_const_char u, cast_const_char rq->orig_url) || + (url_host && casestrstr(url_host, cast_uchar "consent.google")) || + rq->redirect_cnt >= MAX_CACHED_REDIRECTS)) + cache = NC_RELOAD; + if (url_host) + mem_free(url_host); allow_flags = get_allow_flags(rq->url); mem_free(rq->url); rq->url = u; diff --git a/os_dep.c b/os_dep.c index 5ea07b8..3905c7a 100644 --- a/os_dep.c +++ b/os_dep.c @@ -1199,6 +1199,26 @@ void init_os_terminal(void) #endif } +#ifdef WIN +void translate_win32_to_unix(unsigned char **str) +{ +#ifdef HAVE_CYGWIN_CONV_PATH + unsigned char *new_path; + ssize_t sz = cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, *str, NULL, 0); + if (sz < 0 || sz >= MAXINT) + return; + new_path = mem_alloc(sz); + sz = cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, *str, new_path, sz); + if (sz < 0) { + mem_free(new_path); + return; + } + mem_free(*str); + *str = new_path; +#endif +} +#endif + #ifdef INTERIX static inline void cut_program_path(unsigned char *prog, unsigned char **prog_start, unsigned char **prog_end) diff --git a/suffix.inc b/suffix.inc index 60ce27e..6338bc6 100644 --- a/suffix.inc +++ b/suffix.inc @@ -11,6 +11,7 @@ static_const const_char_ptr domain_suffix[] = { "*.bd", "*.beget.app", "*.build.run", + "*.builder.code.com", "*.bzz.dapps.earth", "*.ck", "*.cloud.metacentrum.cz", @@ -25,6 +26,7 @@ static_const const_char_ptr domain_suffix[] = { "*.customer-oci.com", "*.dapps.earth", "*.database.run", + "*.dev-builder.code.com", "*.dev.adobeaemcloud.com", "*.devcdnaccesso.com", "*.developer.app", @@ -84,6 +86,7 @@ static_const const_char_ptr domain_suffix[] = { "*.sensiosite.cloud", "*.spectrum.myjino.ru", "*.statics.cloud", + "*.stg-builder.code.com", "*.stg.dev", "*.stgstage.dev", "*.stolos.io", @@ -114,6 +117,7 @@ static_const const_char_ptr domain_suffix[] = { "1337.pictures", "16-b.it", "1kapp.com", + "2.azurestaticapps.net", "2.bg", "2000.hu", "2038.io", @@ -129,9 +133,11 @@ static_const const_char_ptr domain_suffix[] = { "4lima.de", "4u.com", "5.bg", + "5g.in", "6.bg", "611.to", "64-b.it", + "6g.in", "7.bg", "8.bg", "9.bg", @@ -279,6 +285,7 @@ static_const const_char_ptr domain_suffix[] = { "ah.cn", "ah.no", "ai", + "ai.in", "aibetsu.hokkaido.jp", "aichi.jp", "aid.pl", @@ -362,6 +369,7 @@ static_const const_char_ptr domain_suffix[] = { "am", "am.br", "am.gov.br", + "am.in", "am.leg.br", "ama.aichi.jp", "ama.shimane.jp", @@ -767,6 +775,7 @@ static_const const_char_ptr domain_suffix[] = { "be.ax", "be.eu.org", "be.gy", + "beagleboard.io", "bearalvahki.no", "beardu.no", "beats", @@ -826,6 +835,7 @@ static_const const_char_ptr domain_suffix[] = { "bieszczady.pl", "bievat.no", "bifuka.hokkaido.jp", + "bihar.in", "bihoro.hokkaido.jp", "bike", "bilbao.museum", @@ -854,6 +864,7 @@ static_const const_char_ptr domain_suffix[] = { "biz.fj", "biz.gl", "biz.id", + "biz.in", "biz.ki", "biz.ls", "biz.mv", @@ -1075,7 +1086,6 @@ static_const const_char_ptr domain_suffix[] = { "budejju.no", "bugatti", "build", - "builder.code.com", "builders", "building.museum", "builtwithdark.com", @@ -1091,6 +1101,7 @@ static_const const_char_ptr domain_suffix[] = { "busan.kr", "bushey.museum", "business", + "business.in", "but.jp", "buy", "buyshop.jp", @@ -1116,6 +1127,7 @@ static_const const_char_ptr domain_suffix[] = { "ca", "ca-central-1.elasticbeanstalk.com", "ca.eu.org", + "ca.in", "ca.it", "ca.na", "ca.reclaim.cloud", @@ -1445,6 +1457,7 @@ static_const const_char_ptr domain_suffix[] = { "cn-northwest-1.eb.amazonaws.com.cn", "cn.com", "cn.eu.org", + "cn.in", "cn.it", "cn.ua", "cn.vu", @@ -1606,6 +1619,7 @@ static_const const_char_ptr domain_suffix[] = { "com.hr", "com.ht", "com.im", + "com.in", "com.io", "com.iq", "com.is", @@ -1730,6 +1744,7 @@ static_const const_char_ptr domain_suffix[] = { "coop.ar", "coop.br", "coop.ht", + "coop.in", "coop.km", "coop.mv", "coop.mw", @@ -1779,6 +1794,7 @@ static_const const_char_ptr domain_suffix[] = { "crs", "cruise", "cruises", + "cs.in", "cs.it", "cs.keliweb.cloud", "csx.cc", @@ -1895,6 +1911,7 @@ static_const const_char_ptr domain_suffix[] = { "definima.net", "degree", "delaware.museum", + "delhi.in", "delivery", "dell", "dell-ogliastra.it", @@ -1927,7 +1944,6 @@ static_const const_char_ptr domain_suffix[] = { "deta.dev", "detroit.museum", "dev", - "dev-builder.code.com", "dev-myqnapcloud.com", "dev.br", "dev.static.land", @@ -2012,6 +2028,7 @@ static_const const_char_ptr domain_suffix[] = { "dovre.no", "download", "dp.ua", + "dr.in", "dr.na", "dr.tr", "drammen.no", @@ -2098,6 +2115,8 @@ static_const const_char_ptr domain_suffix[] = { "eastasia.azurestaticapps.net", "eastcoast.museum", "eastus2.azurestaticapps.net", + "easypanel.app", + "easypanel.host", "eat", "eating-organic.net", "eaton.mi.us", @@ -2332,6 +2351,7 @@ static_const const_char_ptr domain_suffix[] = { "epson", "equipment", "equipment.aero", + "er.in", "ericsson", "erimo.hokkaido.jp", "erni", @@ -2605,6 +2625,10 @@ static_const const_char_ptr domain_suffix[] = { "fr.it", "fra1-de.cloudjiffy.net", "framer.app", + "framer.media", + "framer.photos", + "framer.website", + "framer.wiki", "framercanvas.com", "frana.no", "francaise.museum", @@ -3191,6 +3215,7 @@ static_const const_char_ptr domain_suffix[] = { "guge", "guide", "guitars", + "gujarat.in", "gujo.gifu.jp", "gulen.no", "gunma.jp", @@ -3548,6 +3573,7 @@ static_const const_char_ptr domain_suffix[] = { "ibestad.no", "ibigawa.gifu.jp", "ibm", + "ibxos.it", "ic.gov.pl", "icbc", "ice", @@ -3608,6 +3634,7 @@ static_const const_char_ptr domain_suffix[] = { "il.eu.org", "il.us", "ilawa.pl", + "iliadboxos.it", "illustration.museum", "ilovecollege.info", "im", @@ -3700,6 +3727,7 @@ static_const const_char_ptr domain_suffix[] = { "info.gu", "info.ht", "info.hu", + "info.in", "info.ke", "info.ki", "info.la", @@ -3741,6 +3769,7 @@ static_const const_char_ptr domain_suffix[] = { "int.co", "int.cv", "int.eu.org", + "int.in", "int.is", "int.la", "int.lk", @@ -3757,12 +3786,14 @@ static_const const_char_ptr domain_suffix[] = { "interactive.museum", "international", "internet-dns.de", + "internet.in", "intl.tn", "intuit", "inuyama.aichi.jp", "investments", "inzai.chiba.jp", "io", + "io.in", "io.kg", "iobb.net", "iopsys.se", @@ -3868,6 +3899,7 @@ static_const const_char_ptr domain_suffix[] = { "isen.kagoshima.jp", "isernia.it", "iserv.dev", + "iservschule.de", "isesaki.gunma.jp", "ishigaki.okinawa.jp", "ishikari.hokkaido.jp", @@ -4736,6 +4768,7 @@ static_const const_char_ptr domain_suffix[] = { "lohmus.me", "lol", "lolipop.io", + "lolipopmc.jp", "lolitapunk.jp", "lom.it", "lom.no", @@ -4935,6 +4968,7 @@ static_const const_char_ptr domain_suffix[] = { "md.us", "me", "me.eu.org", + "me.in", "me.it", "me.ke", "me.so", @@ -4995,6 +5029,7 @@ static_const const_char_ptr domain_suffix[] = { "merckmsd", "merseine.nu", "mesaverde.museum", + "messerli.app", "messina.it", "messwithdns.com", "meteorapp.com", @@ -6484,6 +6519,7 @@ static_const const_char_ptr domain_suffix[] = { "pet", "pf", "pfizer", + "pg.in", "pg.it", "pgafan.net", "pgfog.com", @@ -6600,6 +6636,7 @@ static_const const_char_ptr domain_suffix[] = { "portland.museum", "portlligat.museum", "post", + "post.in", "postman-echo.com", "posts-and-telecommunications.museum", "potager.org", @@ -6652,6 +6689,7 @@ static_const const_char_ptr domain_suffix[] = { "pro.ec", "pro.fj", "pro.ht", + "pro.in", "pro.mv", "pro.na", "pro.om", @@ -7188,6 +7226,7 @@ static_const const_char_ptr domain_suffix[] = { "schoolbus.jp", "schools.nsw.edu.au", "schule", + "schulplattform.de", "schulserver.de", "schwarz", "schweiz.museum", @@ -7636,7 +7675,6 @@ static_const const_char_ptr domain_suffix[] = { "steiermark.museum", "steigen.no", "steinkjer.no", - "stg-builder.code.com", "sth.ac.at", "stjohn.museum", "stjordal.no", @@ -7663,6 +7701,7 @@ static_const const_char_ptr domain_suffix[] = { "strand.no", "stranda.no", "stream", + "streamlitapp.com", "stripper.jp", "stryn.no", "student.aero", @@ -8109,6 +8148,7 @@ static_const const_char_ptr domain_suffix[] = { "transporte.bo", "trapani.it", "travel", + "travel.in", "travel.pl", "travel.tt", "travelchannel", @@ -8215,6 +8255,7 @@ static_const const_char_ptr domain_suffix[] = { "tv.bo", "tv.br", "tv.im", + "tv.in", "tv.it", "tv.kg", "tv.na", @@ -8272,6 +8313,7 @@ static_const const_char_ptr domain_suffix[] = { "uk", "uk.com", "uk.eu.org", + "uk.in", "uk.kg", "uk.net", "uk.oxa.cloud", @@ -8310,6 +8352,7 @@ static_const const_char_ptr domain_suffix[] = { "uol", "uonuma.niigata.jp", "uozu.toyama.jp", + "up.in", "upaas.kazteleport.kz", "upli.io", "upow.gov.pl", @@ -8345,6 +8388,7 @@ static_const const_char_ptr domain_suffix[] = { "us.com", "us.eu.org", "us.gov.pl", + "us.in", "us.kg", "us.na", "us.org", @@ -8474,6 +8518,27 @@ static_const const_char_ptr domain_suffix[] = { "veterinaire.km", "vevelstad.no", "vf.no", + "vfs.cloud9.af-south-1.amazonaws.com", + "vfs.cloud9.ap-east-1.amazonaws.com", + "vfs.cloud9.ap-northeast-1.amazonaws.com", + "vfs.cloud9.ap-northeast-2.amazonaws.com", + "vfs.cloud9.ap-northeast-3.amazonaws.com", + "vfs.cloud9.ap-south-1.amazonaws.com", + "vfs.cloud9.ap-southeast-1.amazonaws.com", + "vfs.cloud9.ap-southeast-2.amazonaws.com", + "vfs.cloud9.ca-central-1.amazonaws.com", + "vfs.cloud9.eu-central-1.amazonaws.com", + "vfs.cloud9.eu-north-1.amazonaws.com", + "vfs.cloud9.eu-south-1.amazonaws.com", + "vfs.cloud9.eu-west-1.amazonaws.com", + "vfs.cloud9.eu-west-2.amazonaws.com", + "vfs.cloud9.eu-west-3.amazonaws.com", + "vfs.cloud9.me-south-1.amazonaws.com", + "vfs.cloud9.sa-east-1.amazonaws.com", + "vfs.cloud9.us-east-1.amazonaws.com", + "vfs.cloud9.us-east-2.amazonaws.com", + "vfs.cloud9.us-west-1.amazonaws.com", + "vfs.cloud9.us-west-2.amazonaws.com", "vg", "vgs.no", "vi", @@ -8630,6 +8695,27 @@ static_const const_char_ptr domain_suffix[] = { "website.yandexcloud.net", "webspace.rocks", "webthings.io", + "webview-assets.cloud9.af-south-1.amazonaws.com", + "webview-assets.cloud9.ap-east-1.amazonaws.com", + "webview-assets.cloud9.ap-northeast-1.amazonaws.com", + "webview-assets.cloud9.ap-northeast-2.amazonaws.com", + "webview-assets.cloud9.ap-northeast-3.amazonaws.com", + "webview-assets.cloud9.ap-south-1.amazonaws.com", + "webview-assets.cloud9.ap-southeast-1.amazonaws.com", + "webview-assets.cloud9.ap-southeast-2.amazonaws.com", + "webview-assets.cloud9.ca-central-1.amazonaws.com", + "webview-assets.cloud9.eu-central-1.amazonaws.com", + "webview-assets.cloud9.eu-north-1.amazonaws.com", + "webview-assets.cloud9.eu-south-1.amazonaws.com", + "webview-assets.cloud9.eu-west-1.amazonaws.com", + "webview-assets.cloud9.eu-west-2.amazonaws.com", + "webview-assets.cloud9.eu-west-3.amazonaws.com", + "webview-assets.cloud9.me-south-1.amazonaws.com", + "webview-assets.cloud9.sa-east-1.amazonaws.com", + "webview-assets.cloud9.us-east-1.amazonaws.com", + "webview-assets.cloud9.us-east-2.amazonaws.com", + "webview-assets.cloud9.us-west-1.amazonaws.com", + "webview-assets.cloud9.us-west-2.amazonaws.com", "wedding", "wedeploy.io", "wedeploy.me", @@ -8751,6 +8837,8 @@ static_const const_char_ptr domain_suffix[] = { "xn--45br5cyl", "xn--45brj9c", "xn--45q11c", + "xn--4dbgdty6c.xn--4dbrk0ce", + "xn--4dbrk0ce", "xn--4gbrim", "xn--4it168d.jp", "xn--4it797k.jp", @@ -8761,6 +8849,7 @@ static_const const_char_ptr domain_suffix[] = { "xn--55qx5d.cn", "xn--55qx5d.hk", "xn--55qx5d.xn--j6w193g", + "xn--5dbhl8d.xn--4dbrk0ce", "xn--5js045d.jp", "xn--5rtp49c.jp", "xn--5rtq34k.jp", @@ -8778,6 +8867,7 @@ static_const const_char_ptr domain_suffix[] = { "xn--80asehdb", "xn--80aswg", "xn--80au.xn--90a3ac", + "xn--8dbq2a.xn--4dbrk0ce", "xn--8ltr62k.jp", "xn--8pvr4u.jp", "xn--8y0a063a", @@ -8899,6 +8989,7 @@ static_const const_char_ptr domain_suffix[] = { "xn--h3cuzk1di.xn--o3cw4h", "xn--hbmer-xqa.no", "xn--hcesuolo-7ya35b.no", + "xn--hebda8b.xn--4dbrk0ce", "xn--hery-ira.nordland.no", "xn--hery-ira.xn--mre-og-romsdal-qqb.no", "xn--hgebostad-g3a.no", diff --git a/suffix/public_suffix_list.dat b/suffix/public_suffix_list.dat index f521691..5676a31 100644 --- a/suffix/public_suffix_list.dat +++ b/suffix/public_suffix_list.dat @@ -1315,7 +1315,9 @@ web.id ie gov.ie -// il : http://www.isoc.org.il/domains/ +// il : http://www.isoc.org.il/domains/ +// see also: https://en.isoc.org.il/il-cctld/registration-rules +// ISOC-IL (operated by .il Registry) il ac.il co.il @@ -1325,6 +1327,16 @@ k12.il muni.il net.il org.il +// xn--4dbrk0ce ("Israel", Hebrew) : IL +ישראל +// xn--4dbgdty6c.xn--4dbrk0ce. +אקדמיה.ישראל +// xn--5dbhl8d.xn--4dbrk0ce. +ישוב.ישראל +// xn--8dbq2a.xn--4dbrk0ce. +צהל.ישראל +// xn--hebda8b.xn--4dbrk0ce. +ממשל.ישראל // im : https://www.nic.im/ // Submitted by registry @@ -1340,22 +1352,51 @@ tt.im tv.im // in : https://en.wikipedia.org/wiki/.in -// see also: https://registry.in/Policies +// see also: https://registry.in/policies // Please note, that nic.in is not an official eTLD, but used by most // government institutions. in -co.in -firm.in -net.in -org.in -gen.in -ind.in -nic.in +5g.in +6g.in ac.in +ai.in +am.in +bihar.in +biz.in +business.in +ca.in +cn.in +co.in +com.in +coop.in +cs.in +delhi.in +dr.in edu.in -res.in +er.in +firm.in +gen.in gov.in +gujarat.in +ind.in +info.in +int.in +internet.in +io.in +me.in mil.in +net.in +nic.in +org.in +pg.in +post.in +pro.in +res.in +travel.in +tv.in +uk.in +up.in +us.in // info : https://en.wikipedia.org/wiki/.info info @@ -7130,7 +7171,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-05-18T15:16:02Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-09-15T15:17:34Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7639,7 +7680,7 @@ cars // casa : 2013-11-21 Registry Services, LLC casa -// case : 2015-09-03 Helium TLDs Ltd +// case : 2015-09-03 Digity, LLC case // cash : 2014-03-06 Binky Moon, LLC @@ -7687,7 +7728,7 @@ chanel // channel : 2014-05-08 Charleston Road Registry Inc. channel -// charity : 2018-04-11 Binky Moon, LLC +// charity : 2018-04-11 Public Interest Registry charity // chase : 2015-04-30 JPMorgan Chase Bank, National Association @@ -7825,7 +7866,7 @@ cool // corsica : 2014-09-25 Collectivité de Corse corsica -// country : 2013-12-19 DotCountry LLC +// country : 2013-12-19 Internet Naming Company LLC country // coupon : 2015-02-26 Amazon Registry Services, Inc. @@ -7834,7 +7875,7 @@ coupon // coupons : 2015-03-26 Binky Moon, LLC coupons -// courses : 2014-12-04 OPEN UNIVERSITIES AUSTRALIA PTY LTD +// courses : 2014-12-04 Registry Services, LLC courses // cpa : 2019-06-10 American Institute of Certified Public Accountants @@ -8020,7 +8061,7 @@ dvag // dvr : 2016-05-26 DISH Technologies L.L.C. dvr -// earth : 2014-12-04 Interlink Co., Ltd. +// earth : 2014-12-04 Interlink Systems Innovation Institute K.K. earth // eat : 2014-01-23 Charleston Road Registry Inc. @@ -8227,7 +8268,7 @@ forsale // forum : 2015-04-02 Fegistry, LLC forum -// foundation : 2013-12-05 Binky Moon, LLC +// foundation : 2013-12-05 Public Interest Registry foundation // fox : 2015-09-11 FOX Registry, LLC @@ -8326,10 +8367,10 @@ gift // gifts : 2014-07-03 Binky Moon, LLC gifts -// gives : 2014-03-06 Dog Beach, LLC +// gives : 2014-03-06 Public Interest Registry gives -// giving : 2014-11-13 Giving Limited +// giving : 2014-11-13 Public Interest Registry giving // glass : 2013-11-07 Binky Moon, LLC @@ -8452,7 +8493,7 @@ health // healthcare : 2014-06-12 Binky Moon, LLC healthcare -// help : 2014-06-26 UNR Corp. +// help : 2014-06-26 Innovation service Limited help // helsinki : 2015-02-05 City of Helsinki @@ -8779,7 +8820,7 @@ lanxess // lasalle : 2015-04-02 Jones Lang LaSalle Incorporated lasalle -// lat : 2014-10-16 ECOM-LAC Federaciòn de Latinoamèrica y el Caribe para Internet y el Comercio Electrònico +// lat : 2014-10-16 XYZ.COM LLC lat // latino : 2015-07-30 Dish DBS Corporation @@ -8866,7 +8907,7 @@ living // llc : 2017-12-14 Afilias Limited llc -// llp : 2019-08-26 UNR Corp. +// llp : 2019-08-26 Intercap Registry Inc. llp // loan : 2014-11-20 dot Loan Limited @@ -9034,7 +9075,7 @@ mobile // moda : 2013-11-07 Dog Beach, LLC moda -// moe : 2013-11-13 Interlink Co., Ltd. +// moe : 2013-11-13 Interlink Systems Innovation Institute K.K. moe // moi : 2014-12-18 Amazon Registry Services, Inc. @@ -9841,7 +9882,7 @@ stream // studio : 2015-02-11 Dog Beach, LLC studio -// study : 2014-12-11 OPEN UNIVERSITIES AUSTRALIA PTY LTD +// study : 2014-12-11 Registry Services, LLC study // style : 2014-12-04 Binky Moon, LLC @@ -10763,6 +10804,52 @@ s3-website.eu-west-2.amazonaws.com s3-website.eu-west-3.amazonaws.com s3-website.us-east-2.amazonaws.com +// AWS Cloud9 : https://aws.amazon.com/cloud9/ +// Submitted by: AWS Security +// Reference: 2b6dfa9a-3a7f-4367-b2e7-0321e77c0d59 +vfs.cloud9.af-south-1.amazonaws.com +webview-assets.cloud9.af-south-1.amazonaws.com +vfs.cloud9.ap-east-1.amazonaws.com +webview-assets.cloud9.ap-east-1.amazonaws.com +vfs.cloud9.ap-northeast-1.amazonaws.com +webview-assets.cloud9.ap-northeast-1.amazonaws.com +vfs.cloud9.ap-northeast-2.amazonaws.com +webview-assets.cloud9.ap-northeast-2.amazonaws.com +vfs.cloud9.ap-northeast-3.amazonaws.com +webview-assets.cloud9.ap-northeast-3.amazonaws.com +vfs.cloud9.ap-south-1.amazonaws.com +webview-assets.cloud9.ap-south-1.amazonaws.com +vfs.cloud9.ap-southeast-1.amazonaws.com +webview-assets.cloud9.ap-southeast-1.amazonaws.com +vfs.cloud9.ap-southeast-2.amazonaws.com +webview-assets.cloud9.ap-southeast-2.amazonaws.com +vfs.cloud9.ca-central-1.amazonaws.com +webview-assets.cloud9.ca-central-1.amazonaws.com +vfs.cloud9.eu-central-1.amazonaws.com +webview-assets.cloud9.eu-central-1.amazonaws.com +vfs.cloud9.eu-north-1.amazonaws.com +webview-assets.cloud9.eu-north-1.amazonaws.com +vfs.cloud9.eu-south-1.amazonaws.com +webview-assets.cloud9.eu-south-1.amazonaws.com +vfs.cloud9.eu-west-1.amazonaws.com +webview-assets.cloud9.eu-west-1.amazonaws.com +vfs.cloud9.eu-west-2.amazonaws.com +webview-assets.cloud9.eu-west-2.amazonaws.com +vfs.cloud9.eu-west-3.amazonaws.com +webview-assets.cloud9.eu-west-3.amazonaws.com +vfs.cloud9.me-south-1.amazonaws.com +webview-assets.cloud9.me-south-1.amazonaws.com +vfs.cloud9.sa-east-1.amazonaws.com +webview-assets.cloud9.sa-east-1.amazonaws.com +vfs.cloud9.us-east-1.amazonaws.com +webview-assets.cloud9.us-east-1.amazonaws.com +vfs.cloud9.us-east-2.amazonaws.com +webview-assets.cloud9.us-east-2.amazonaws.com +vfs.cloud9.us-west-1.amazonaws.com +webview-assets.cloud9.us-west-1.amazonaws.com +vfs.cloud9.us-west-2.amazonaws.com +webview-assets.cloud9.us-west-2.amazonaws.com + // Amune : https://amune.org/ // Submitted by Team Amune t3l3p0rt.net @@ -10871,6 +10958,10 @@ theshop.jp shopselect.net base.shop +// BeagleBoard.org Foundation : https://beagleboard.org +// Submitted by Jason Kridner +beagleboard.io + // Beget Ltd // Submitted by Lev Nekrasov *.beget.app @@ -11649,6 +11740,11 @@ dynv6.net // Submitted by Vladimir Dudr e4.cz +// Easypanel : https://easypanel.io +// Submitted by Andrei Canta +easypanel.app +easypanel.host + // eero : https://eero.com/ // Submitted by Yue Kang eero.online @@ -11943,6 +12039,10 @@ id.forgerock.io // Submitted by Koen Rouwhorst framer.app framercanvas.com +framer.media +framer.photos +framer.website +framer.wiki // Frusky MEDIA&PR : https://www.frusky.de // Submitted by Victor Pupynin @@ -12111,6 +12211,7 @@ kill.jp kilo.jp kuron.jp littlestar.jp +lolipopmc.jp lolitapunk.jp lomo.jp lovepop.jp @@ -12378,6 +12479,11 @@ moonscale.net // Submitted by Hannu Aronsson iki.fi +// iliad italia: https://www.iliad.it +// Submitted by Marios Makassikis +ibxos.it +iliadboxos.it + // Impertrix Solutions : // Submitted by Zhixiang Zhao impertrixcdn.com @@ -12458,9 +12564,11 @@ iopsys.se // Submitted by Matthew Hardeman ipifony.net -// IServ GmbH : https://iserv.eu -// Submitted by Kim-Alexander Brodowski +// IServ GmbH : https://iserv.de +// Submitted by Mario Hoberg +iservschule.de mein-iserv.de +schulplattform.de schulserver.de test-iserv.de iserv.dev @@ -12782,6 +12890,10 @@ hra.health miniserver.com memset.net +// Messerli Informatik AG : https://www.messerli.ch/ +// Submitted by Ruben Schmidmeister +messerli.app + // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/ // Submitted by Zdeněk Šustr *.cloud.metacentrum.cz @@ -12808,6 +12920,7 @@ azure-mobile.net cloudapp.net azurestaticapps.net 1.azurestaticapps.net +2.azurestaticapps.net centralus.azurestaticapps.net eastasia.azurestaticapps.net eastus2.azurestaticapps.net @@ -13394,9 +13507,9 @@ rocky.page // Salesforce.com, Inc. https://salesforce.com/ // Submitted by Michael Biven -builder.code.com -dev-builder.code.com -stg-builder.code.com +*.builder.code.com +*.dev-builder.code.com +*.stg-builder.code.com // Sandstorm Development Group, Inc. : https://sandcats.io/ // Submitted by Asheesh Laroia @@ -13542,6 +13655,10 @@ small-web.org // Submitted by Dan Kozak vp4.me +// Snowflake Inc : https://www.snowflake.com/ +// Submitted by Faith Olapade +streamlitapp.com + // Snowplow Analytics : https://snowplowanalytics.com/ // Submitted by Ian Streeter try-snowplow.com