diff --git a/intl/icu/source/data/misc/metaZones.txt b/intl/icu/source/data/misc/metaZones.txt index c8101cacdd..1c4c6bd6b5 100644 --- a/intl/icu/source/data/misc/metaZones.txt +++ b/intl/icu/source/data/misc/metaZones.txt @@ -711,6 +711,166 @@ metaZones:table(nofallback){ 001{"America/Whitehorse"} } } + metazoneIds{ + acre{"Acre"} + afce{"Africa_Central"} + afea{"Africa_Eastern"} + afgh{"Afghanistan"} + afso{"Africa_Southern"} + afwe{"Africa_Western"} + alam{"Almaty"} + alas{"Alaska"} + amaz{"Amazon"} + amce{"America_Central"} + amea{"America_Eastern"} + ammo{"America_Mountain"} + ampa{"America_Pacific"} + anad{"Anadyr"} + apia{"Apia"} + aqta{"Aqtau"} + aqto{"Aqtobe"} + arab{"Arabian"} + arge{"Argentina"} + arme{"Armenia"} + arwe{"Argentina_Western"} + atla{"Atlantic"} + auce{"Australia_Central"} + aucw{"Australia_CentralWestern"} + auea{"Australia_Eastern"} + auwe{"Australia_Western"} + azer{"Azerbaijan"} + azor{"Azores"} + bang{"Bangladesh"} + bhut{"Bhutan"} + boli{"Bolivia"} + bras{"Brasilia"} + brun{"Brunei"} + case{"Casey"} + cave{"Cape_Verde"} + cham{"Chamorro"} + chat{"Chatham"} + chil{"Chile"} + chin{"China"} + choi{"Choibalsan"} + chri{"Christmas"} + coco{"Cocos"} + colo{"Colombia"} + cook{"Cook"} + cuba{"Cuba"} + davi{"Davis"} + dumo{"DumontDUrville"} + east{"Easter"} + eati{"East_Timor"} + ecua{"Ecuador"} + euce{"Europe_Central"} + euea{"Europe_Eastern"} + eufe{"Europe_Further_Eastern"} + euwe{"Europe_Western"} + falk{"Falkland"} + fiji{"Fiji"} + frgu{"French_Guiana"} + frso{"French_Southern"} + gala{"Galapagos"} + gamb{"Gambier"} + geor{"Georgia"} + giis{"Gilbert_Islands"} + grea{"Greenland_Eastern"} + grwe{"Greenland_Western"} + guam{"Guam"} + gulf{"Gulf"} + guya{"Guyana"} + haal{"Hawaii_Aleutian"} + hoko{"Hong_Kong"} + hovd{"Hovd"} + ince{"Indonesia_Central"} + indi{"India"} + indo{"Indochina"} + inea{"Indonesia_Eastern"} + inoc{"Indian_Ocean"} + inwe{"Indonesia_Western"} + iran{"Iran"} + irku{"Irkutsk"} + isra{"Israel"} + japa{"Japan"} + kaea{"Kazakhstan_Eastern"} + kamc{"Kamchatka"} + kawe{"Kazakhstan_Western"} + kore{"Korea"} + kosr{"Kosrae"} + kras{"Krasnoyarsk"} + kyrg{"Kyrgystan"} + lank{"Lanka"} + liis{"Line_Islands"} + loho{"Lord_Howe"} + maca{"Macau"} + macq{"Macquarie"} + maga{"Magadan"} + mais{"Marshall_Islands"} + mala{"Malaysia"} + mald{"Maldives"} + marq{"Marquesas"} + maur{"Mauritius"} + maws{"Mawson"} + meno{"Mexico_Northwest"} + mepa{"Mexico_Pacific"} + mgmt{"GMT"} + mong{"Mongolia"} + mosc{"Moscow"} + myan{"Myanmar"} + naur{"Nauru"} + neca{"New_Caledonia"} + nepa{"Nepal"} + newf{"Newfoundland"} + neze{"New_Zealand"} + niue{"Niue"} + noma{"North_Mariana"} + norf{"Norfolk"} + noro{"Noronha"} + novo{"Novosibirsk"} + omsk{"Omsk"} + paki{"Pakistan"} + pala{"Palau"} + pang{"Papua_New_Guinea"} + para{"Paraguay"} + peru{"Peru"} + phil{"Philippines"} + phis{"Phoenix_Islands"} + pimi{"Pierre_Miquelon"} + pitc{"Pitcairn"} + pona{"Ponape"} + pyon{"Pyongyang"} + qyzy{"Qyzylorda"} + reun{"Reunion"} + roth{"Rothera"} + sakh{"Sakhalin"} + sama{"Samara"} + samo{"Samoa"} + seyc{"Seychelles"} + sing{"Singapore"} + soge{"South_Georgia"} + solo{"Solomon"} + suri{"Suriname"} + syow{"Syowa"} + tahi{"Tahiti"} + taip{"Taipei"} + taji{"Tajikistan"} + toke{"Tokelau"} + tong{"Tonga"} + truk{"Truk"} + turk{"Turkmenistan"} + tuva{"Tuvalu"} + urug{"Uruguay"} + uzbe{"Uzbekistan"} + vanu{"Vanuatu"} + vene{"Venezuela"} + vlad{"Vladivostok"} + volg{"Volgograd"} + vost{"Vostok"} + wake{"Wake"} + wall{"Wallis"} + yaku{"Yakutsk"} + yeka{"Yekaterinburg"} + } metazoneInfo{ "Africa:Abidjan"{ { diff --git a/intl/icu/source/data/misc/timezoneTypes.txt b/intl/icu/source/data/misc/timezoneTypes.txt index a1d4fd708e..faa0298192 100644 --- a/intl/icu/source/data/misc/timezoneTypes.txt +++ b/intl/icu/source/data/misc/timezoneTypes.txt @@ -606,168 +606,10 @@ timezoneTypes:table(nofallback){ "Pacific:Truk"{"fmtkk"} "Pacific:Wake"{"umawk"} "Pacific:Wallis"{"wfmau"} - Acre{"acre"} - Afghanistan{"afgh"} - Africa_Central{"afce"} - Africa_Eastern{"afea"} - Africa_Southern{"afso"} - Africa_Western{"afwe"} - Alaska{"alas"} - Almaty{"alam"} - Amazon{"amaz"} - America_Central{"amce"} - America_Eastern{"amea"} - America_Mountain{"ammo"} - America_Pacific{"ampa"} - Anadyr{"anad"} - Apia{"apia"} - Aqtau{"aqta"} - Aqtobe{"aqto"} - Arabian{"arab"} - Argentina{"arge"} - Argentina_Western{"arwe"} - Armenia{"arme"} - Atlantic{"atla"} - Australia_Central{"auce"} - Australia_CentralWestern{"aucw"} - Australia_Eastern{"auea"} - Australia_Western{"auwe"} - Azerbaijan{"azer"} - Azores{"azor"} - Bangladesh{"bang"} - Bhutan{"bhut"} - Bolivia{"boli"} - Brasilia{"bras"} - Brunei{"brun"} CST6CDT{"cst6cdt"} - Cape_Verde{"cave"} - Casey{"case"} - Chamorro{"cham"} - Chatham{"chat"} - Chile{"chil"} - China{"chin"} - Choibalsan{"choi"} - Christmas{"chri"} - Cocos{"coco"} - Colombia{"colo"} - Cook{"cook"} - Cuba{"cuba"} - Davis{"davi"} - DumontDUrville{"dumo"} EST5EDT{"est5edt"} - East_Timor{"eati"} - Easter{"east"} - Ecuador{"ecua"} - Europe_Central{"euce"} - Europe_Eastern{"euea"} - Europe_Further_Eastern{"eufe"} - Europe_Western{"euwe"} - Falkland{"falk"} - Fiji{"fiji"} - French_Guiana{"frgu"} - French_Southern{"frso"} - GMT{"mgmt"} - Galapagos{"gala"} - Gambier{"gamb"} - Georgia{"geor"} - Gilbert_Islands{"giis"} - Greenland_Eastern{"grea"} - Greenland_Western{"grwe"} - Guam{"guam"} - Gulf{"gulf"} - Guyana{"guya"} - Hawaii_Aleutian{"haal"} - Hong_Kong{"hoko"} - Hovd{"hovd"} - India{"indi"} - Indian_Ocean{"inoc"} - Indochina{"indo"} - Indonesia_Central{"ince"} - Indonesia_Eastern{"inea"} - Indonesia_Western{"inwe"} - Iran{"iran"} - Irkutsk{"irku"} - Israel{"isra"} - Japan{"japa"} - Kamchatka{"kamc"} - Kazakhstan_Eastern{"kaea"} - Kazakhstan_Western{"kawe"} - Korea{"kore"} - Kosrae{"kosr"} - Krasnoyarsk{"kras"} - Kyrgystan{"kyrg"} - Lanka{"lank"} - Line_Islands{"liis"} - Lord_Howe{"loho"} MST7MDT{"mst7mdt"} - Macau{"maca"} - Macquarie{"macq"} - Magadan{"maga"} - Malaysia{"mala"} - Maldives{"mald"} - Marquesas{"marq"} - Marshall_Islands{"mais"} - Mauritius{"maur"} - Mawson{"maws"} - Mexico_Northwest{"meno"} - Mexico_Pacific{"mepa"} - Mongolia{"mong"} - Moscow{"mosc"} - Myanmar{"myan"} - Nauru{"naur"} - Nepal{"nepa"} - New_Caledonia{"neca"} - New_Zealand{"neze"} - Newfoundland{"newf"} - Niue{"niue"} - Norfolk{"norf"} - Noronha{"noro"} - North_Mariana{"noma"} - Novosibirsk{"novo"} - Omsk{"omsk"} PST8PDT{"pst8pdt"} - Pakistan{"paki"} - Palau{"pala"} - Papua_New_Guinea{"pang"} - Paraguay{"para"} - Peru{"peru"} - Philippines{"phil"} - Phoenix_Islands{"phis"} - Pierre_Miquelon{"pimi"} - Pitcairn{"pitc"} - Ponape{"pona"} - Pyongyang{"pyon"} - Qyzylorda{"qyzy"} - Reunion{"reun"} - Rothera{"roth"} - Sakhalin{"sakh"} - Samara{"sama"} - Samoa{"samo"} - Seychelles{"seyc"} - Singapore{"sing"} - Solomon{"solo"} - South_Georgia{"soge"} - Suriname{"suri"} - Syowa{"syow"} - Tahiti{"tahi"} - Taipei{"taip"} - Tajikistan{"taji"} - Tokelau{"toke"} - Tonga{"tong"} - Truk{"truk"} - Turkmenistan{"turk"} - Tuvalu{"tuva"} - Uruguay{"urug"} - Uzbekistan{"uzbe"} - Vanuatu{"vanu"} - Venezuela{"vene"} - Vladivostok{"vlad"} - Volgograd{"volg"} - Vostok{"vost"} - Wake{"wake"} - Wallis{"wall"} - Yakutsk{"yaku"} - Yekaterinburg{"yeka"} } } } diff --git a/intl/icu/source/data/misc/zoneinfo64.txt b/intl/icu/source/data/misc/zoneinfo64.txt index baccda734b..48bbfbb27a 100644 --- a/intl/icu/source/data/misc/zoneinfo64.txt +++ b/intl/icu/source/data/misc/zoneinfo64.txt @@ -3,17 +3,17 @@ // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Mon Jan 4 23:38:49 2021 +// Build date: Mon Sep 27 21:39:51 2021 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2020f -// ICU version: 68.2 +// tz version: 2021a1 +// ICU version: 70.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2020f" } + TZVersion { "2021a1" } Zones:array { /* ACT */ :int { 356 } //Z#0 /* AET */ :int { 368 } //Z#1 @@ -95,9 +95,9 @@ zoneinfo64:table(nofallback) { links:intvector { 30, 44, 45 } } //Z#30 /* Africa/Juba */ :table { - trans:intvector { -1230775588, 10360800, 24786000, 41810400, 56322000, 73432800, 87944400, 104882400, 119480400, 136332000, 151016400, 167781600, 182552400, 199231200, 214174800, 230680800, 245710800, 262735200, 277246800, 294184800, 308782800, 325634400, 340405200, 357084000, 371941200, 388533600, 403477200, 419983200, 435013200, 452037600, 466635600, 483487200, 498171600, 947930400 } + trans:intvector { -1230775588, 10360800, 24786000, 41810400, 56322000, 73432800, 87944400, 104882400, 119480400, 136332000, 151016400, 167781600, 182552400, 199231200, 214174800, 230680800, 245710800, 262735200, 277246800, 294184800, 308782800, 325634400, 340405200, 357084000, 371941200, 388533600, 403477200, 419983200, 435013200, 452037600, 466635600, 483487200, 498171600, 947930400, 1612126800 } typeOffsets:intvector { 7588, 0, 7200, 0, 7200, 3600, 10800, 0 } - typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020103" } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010301" } } //Z#31 /* Africa/Kampala */ :int { 48 } //Z#32 /* Africa/Khartoum */ :table { @@ -308,9 +308,9 @@ zoneinfo64:table(nofallback) { finalYear:int { 2012 } } //Z#82 /* America/Barbados */ :table { - trans:intvector { -1199217691, 234943200, 244616400, 261554400, 276066000, 293004000, 307515600, 325058400, 338706000 } - typeOffsets:intvector { -14309, 0, -14400, 0, -14400, 3600 } - typeMap:bin { "010201020102010201" } + trans:intvector { -1841256091, -874263600, -862682400, -841604400, -830714400, -811882800, -798660000, 234943200, 244616400, 261554400, 276066000, 293004000, 307515600, 325058400, 338706000 } + typeOffsets:intvector { -14309, 0, -14400, 0, -14400, 1800, -14400, 3600 } + typeMap:bin { "010301030102010301030103010301" } } //Z#83 /* America/Belem */ :table { trans:intvector { -1767213964, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600 } @@ -531,9 +531,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01020302" } } //Z#126 /* America/Guyana */ :table { - trans:intvector { -1730578040, 176010300, 662698800 } - typeOffsets:intvector { -13960, 0, -14400, 0, -13500, 0, -10800, 0 } - typeMap:bin { "020301" } + trans:intvector { -1843589241, -1730577600, 176096700, 701841600 } + typeOffsets:intvector { -13959, 0, -14400, 0, -13500, 0, -10800, 0 } + typeMap:bin { "01020301" } } //Z#127 /* America/Halifax */ :table { trans:intvector { -2131645536, -1696276800, -1680469200, -1632074400, -1615143600, -1566763200, -1557090000, -1535486400, -1524949200, -1504468800, -1493413200, -1472414400, -1461963600, -1440964800, -1429390800, -1409515200, -1396731600, -1376856000, -1366491600, -1346616000, -1333832400, -1313956800, -1303678800, -1282507200, -1272661200, -1251057600, -1240088400, -1219608000, -1207429200, -1188763200, -1175979600, -1157313600, -1143925200, -1124049600, -1113771600, -1091390400, -1081026000, -1059854400, -1050786000, -1030910400, -1018126800, -999460800, -986677200, -965592000, -955227600, -935956800, -923173200, -904507200, -891723600, -880221600, -765399600, -747252000, -733950000, -715802400, -702500400, -684352800, -671050800, -652903200, -639601200, -589399200, -576097200, -557949600, -544647600, -526500000, -513198000, -495050400, -481748400, -431546400, -418244400, -400096800, -386794800, -368647200, -355345200, -337197600, -323895600, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 } @@ -1226,12 +1226,12 @@ zoneinfo64:table(nofallback) { typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403" } } //Z#240 /* Asia/Amman */ :table { - trans:intvector { -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1112306400, 1128031200, 1143756000, 1161900000, 1175205600, 1193349600, 1206655200, 1225404000, 1238104800, 1256853600, 1269554400, 1288303200, 1301608800, 1319752800, 1333058400, 1387486800, 1395957600, 1414706400 } + trans:intvector { -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1112306400, 1128031200, 1143756000, 1161900000, 1175205600, 1193349600, 1206655200, 1225404000, 1238104800, 1256853600, 1269554400, 1288303200, 1301608800, 1319752800, 1333058400, 1387486800, 1395957600, 1414706400, 1427407200, 1446156000, 1459461600, 1477605600, 1490911200, 1509055200, 1522360800, 1540504800, 1553810400, 1571954400, 1585260000, 1604008800, 1616709600, 1635458400, 1645740000, 1666908000 } typeOffsets:intvector { 8624, 0, 7200, 0, 7200, 3600 } - typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } finalRule { "Jordan" } finalRaw:int { 7200 } - finalYear:int { 2015 } + finalYear:int { 2023 } } //Z#241 /* Asia/Anadyr */ :table { trans:intvector { -1441194596, -1247572800, 354884400, 370692000, 386420400, 402231600, 417960000, 433767600, 449582400, 465314400, 481039200, 496764000, 512488800, 528213600, 543938400, 559663200, 575388000, 591112800, 606837600, 622562400, 638287200, 654616800, 670341600, 686070000, 695746800, 701791200, 717516000, 733240800, 748965600, 764690400, 780415200, 796140000, 811864800, 828194400, 846338400, 859644000, 877788000, 891093600, 909237600, 922543200, 941292000, 953992800, 972741600, 985442400, 1004191200, 1017496800, 1035640800, 1048946400, 1067090400, 1080396000, 1099144800, 1111845600, 1130594400, 1143295200, 1162044000, 1174744800, 1193493600, 1206799200, 1224943200, 1238248800, 1256392800, 1269698400, 1288450800, 1301151600 } @@ -1696,9 +1696,9 @@ zoneinfo64:table(nofallback) { } //Z#337 /* Atlantic/Azores */ :table { transPre32:intvector { -1, 1581063056 } - trans:intvector { -1830376800, -1689548400, -1677794400, -1667430000, -1647730800, -1635807600, -1616194800, -1604358000, -1584658800, -1572735600, -1553036400, -1541199600, -1521500400, -1442444400, -1426806000, -1379286000, -1364770800, -1348441200, -1333321200, -1316386800, -1301266800, -1284332400, -1269817200, -1221433200, -1206918000, -1191193200, -1175468400, -1127689200, -1111964400, -1096844400, -1080514800, -1063580400, -1049065200, -1033340400, -1017615600, -1002495600, -986166000, -969231600, -950482800, -942015600, -922662000, -906937200, -891126000, -877302000, -873676800, -864000000, -857948400, -845852400, -842832000, -831340800, -825894000, -814402800, -810777600, -799891200, -794444400, -782953200, -779328000, -768441600, -762994800, -749084400, -733359600, -717624000, -701899200, -686174400, -670449600, -654724800, -639000000, -591825600, -575496000, -559771200, -544046400, -528321600, -512596800, -496872000, -481147200, -465422400, -449697600, -433972800, -417643200, -401918400, -386193600, -370468800, -354744000, -339019200, -323294400, -307569600, -291844800, -276120000, -260395200, -244670400, -228340800, -212616000, -196891200, -181166400, -165441600, -149716800, -133992000, -118267200, 228272400, 243997200, 260326800, 276051600, 291776400, 307504800, 323226000, 338954400, 354679200, 370404000, 386128800, 401853600, 417582000, 433303200, 449028000, 465357600, 481082400, 496807200, 512532000, 528256800, 543981600, 559706400, 575431200, 591156000, 606880800, 622605600, 638330400, 654660000, 670384800, 686109600, 701834400, 717559200, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } + trans:intvector { -1830376800, -1689548400, -1677794400, -1667430000, -1647730800, -1635807600, -1616194800, -1604358000, -1584658800, -1572735600, -1553036400, -1541199600, -1521500400, -1442444400, -1426806000, -1379286000, -1364770800, -1348441200, -1333321200, -1316386800, -1301266800, -1284332400, -1269817200, -1221433200, -1206918000, -1191193200, -1175468400, -1127689200, -1111964400, -1096844400, -1080514800, -1063580400, -1049065200, -1033340400, -1017615600, -1002495600, -986166000, -969231600, -950482800, -942015600, -922662000, -906937200, -891126000, -877302000, -873676800, -864000000, -857948400, -845852400, -842832000, -831340800, -825894000, -814402800, -810777600, -799891200, -794444400, -782953200, -779328000, -768441600, -762994800, -749084400, -733359600, -717624000, -701899200, -686174400, -670449600, -654724800, -639000000, -623275200, -607550400, -591825600, -575496000, -559771200, -544046400, -528321600, -512596800, -496872000, -481147200, -465422400, -449697600, -433972800, -417643200, -401918400, -386193600, -370468800, -354744000, -339019200, -323294400, -307569600, -291844800, -276120000, -260395200, -244670400, -228340800, -212616000, -196891200, -181166400, -165441600, -149716800, -133992000, -118267200, 228272400, 243997200, 260326800, 276051600, 291776400, 307504800, 323226000, 338954400, 354679200, 370404000, 386128800, 401853600, 417582000, 433303200, 449028000, 465357600, 481082400, 496807200, 512532000, 528256800, 543981600, 559706400, 575431200, 591156000, 606880800, 622605600, 638330400, 654660000, 670384800, 686109600, 701834400, 717559200, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -6160, 0, -7200, 0, -7200, 3600, -7200, 7200, -6872, 0, -3600, 0, -3600, 3600, 0, 0 } - typeMap:bin { "04010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203020102030201020302010203020102010201020102010201020102010201020102010201020102010201020102010201020102010506050605060506050605060506050605060506050605060506050605060506070605060506050605" } + typeMap:bin { "040102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030201020302010203020102030201020102010201020102010201020102010201020102010201020102010201020102010201020102010506050605060506050605060506050605060506050605060506050605060506070605060506050605" } finalRule { "EU" } finalRaw:int { -3600 } finalYear:int { 1997 } @@ -1736,9 +1736,9 @@ zoneinfo64:table(nofallback) { } //Z#343 /* Atlantic/Jan_Mayen */ :int { 475 } //Z#344 /* Atlantic/Madeira */ :table { - trans:intvector { -1830380400, -1689552000, -1677798000, -1667433600, -1647734400, -1635811200, -1616198400, -1604361600, -1584662400, -1572739200, -1553040000, -1541203200, -1521504000, -1442448000, -1426809600, -1379289600, -1364774400, -1348444800, -1333324800, -1316390400, -1301270400, -1284336000, -1269820800, -1221436800, -1206921600, -1191196800, -1175472000, -1127692800, -1111968000, -1096848000, -1080518400, -1063584000, -1049068800, -1033344000, -1017619200, -1002499200, -986169600, -969235200, -950486400, -942019200, -922665600, -906940800, -891129600, -877305600, -873680400, -864003600, -857952000, -845856000, -842835600, -831344400, -825897600, -814406400, -810781200, -799894800, -794448000, -782956800, -779331600, -768445200, -762998400, -749088000, -733363200, -717627600, -701902800, -686178000, -670453200, -654728400, -639003600, -591829200, -575499600, -559774800, -544050000, -528325200, -512600400, -496875600, -481150800, -465426000, -449701200, -433976400, -417646800, -401922000, -386197200, -370472400, -354747600, -339022800, -323298000, -307573200, -291848400, -276123600, -260398800, -244674000, -228344400, -212619600, -196894800, -181170000, -165445200, -149720400, -133995600, -118270800, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } + trans:intvector { -1830380400, -1689552000, -1677798000, -1667433600, -1647734400, -1635811200, -1616198400, -1604361600, -1584662400, -1572739200, -1553040000, -1541203200, -1521504000, -1442448000, -1426809600, -1379289600, -1364774400, -1348444800, -1333324800, -1316390400, -1301270400, -1284336000, -1269820800, -1221436800, -1206921600, -1191196800, -1175472000, -1127692800, -1111968000, -1096848000, -1080518400, -1063584000, -1049068800, -1033344000, -1017619200, -1002499200, -986169600, -969235200, -950486400, -942019200, -922665600, -906940800, -891129600, -877305600, -873680400, -864003600, -857952000, -845856000, -842835600, -831344400, -825897600, -814406400, -810781200, -799894800, -794448000, -782956800, -779331600, -768445200, -762998400, -749088000, -733363200, -717627600, -701902800, -686178000, -670453200, -654728400, -639003600, -623278800, -607554000, -591829200, -575499600, -559774800, -544050000, -528325200, -512600400, -496875600, -481150800, -465426000, -449701200, -433976400, -417646800, -401922000, -386197200, -370472400, -354747600, -339022800, -323298000, -307573200, -291848400, -276123600, -260398800, -244674000, -228344400, -212619600, -196894800, -181170000, -165445200, -149720400, -133995600, -118270800, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -4056, 0, -3600, 0, -3600, 3600, -3600, 7200, 0, 0, 0, 3600 } - typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203020102030201020302010203020102010201020102010201020102010201020102010201020102010201020102010201020102010405040504050405040504050405040504050405040504050405040504050405040504050405040504" } + typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102030201020302010203020102030201020102010201020102010201020102010201020102010201020102010201020102010201020102010405040504050405040504050405040504050405040504050405040504050405040504050405040504" } finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } @@ -2177,9 +2177,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "010304030403040304030403040304030403020102010302010201020102010201020102010201020102010201020102010201020102010201020102010301" } } //Z#463 /* Europe/Lisbon */ :table { - trans:intvector { -1830384000, -1689555600, -1677801600, -1667437200, -1647738000, -1635814800, -1616202000, -1604365200, -1584666000, -1572742800, -1553043600, -1541206800, -1521507600, -1442451600, -1426813200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922669200, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, 212544000, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } + trans:intvector { -1830384000, -1689555600, -1677801600, -1667437200, -1647738000, -1635814800, -1616202000, -1604365200, -1584666000, -1572742800, -1553043600, -1541206800, -1521507600, -1442451600, -1426813200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922669200, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -623282400, -607557600, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, 212544000, 228268800, 243993600, 260323200, 276048000, 291772800, 307501200, 323222400, 338950800, 354675600, 370400400, 386125200, 401850000, 417578400, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -2205, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 } - typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020302010203020102030201020302010201020102010201020102010201020102010201020102010201020102010201020102010201040102010201020102010201020102010201020102010201020102010201020102040504050405040201" } + typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203020102030201020302010203020102010201020102010201020102010201020102010201020102010201020102010201020102010201040102010201020102010201020102010201020102010201020102010201020102040504050405040201" } finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } @@ -2525,12 +2525,9 @@ zoneinfo64:table(nofallback) { } //Z#551 /* Pacific/Apia */ :table { transPre32:intvector { -1, 1849542912 } - trans:intvector { -1861878784, -631110600, 1285498800, 1301752800, 1316872800, 1325239200, 1333202400, 1348927200 } + trans:intvector { -1861878784, -631110600, 1285498800, 1301752800, 1316872800, 1325239200, 1333202400, 1348927200, 1365256800, 1380376800, 1396706400, 1411826400, 1428156000, 1443276000, 1459605600, 1474725600, 1491055200, 1506175200, 1522504800, 1538229600, 1554559200, 1569679200, 1586008800, 1601128800, 1617458400 } typeOffsets:intvector { 45184, 0, -41400, 0, -41216, 0, -39600, 0, -39600, 3600, 46800, 0, 46800, 3600 } - typeMap:bin { "020103040304060506" } - finalRule { "WS" } - finalRaw:int { 46800 } - finalYear:int { 2013 } + typeMap:bin { "0201030403040605060506050605060506050605060506050605" } links:intvector { 535, 552 } } //Z#552 /* Pacific/Auckland */ :table { @@ -2673,10 +2670,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "02010203" } } //Z#575 /* Pacific/Niue */ :table { - transPre32:intvector { -1, 2117555276 } - trans:intvector { -599575200, 276089400 } - typeOffsets:intvector { -40780, 0, -41400, 0, -40800, 0, -39600, 0 } - typeMap:bin { "020103" } + trans:intvector { -543069620, -173623200 } + typeOffsets:intvector { -40780, 0, -40800, 0, -39600, 0 } + typeMap:bin { "0102" } } //Z#576 /* Pacific/Norfolk */ :table { transPre32:intvector { -1, 2117474184 } @@ -2724,10 +2720,10 @@ zoneinfo64:table(nofallback) { typeMap:bin { "0102" } } //Z#584 /* Pacific/Rarotonga */ :table { - transPre32:intvector { -1, 2117552840 } - trans:intvector { 279714600, 289387800, 309952800, 320837400, 341402400, 352287000, 372852000, 384341400, 404906400, 415791000, 436356000, 447240600, 467805600, 478690200, 499255200, 510139800, 530704800, 541589400, 562154400, 573643800, 594208800, 605093400, 625658400, 636543000, 657108000, 667992600 } - typeOffsets:intvector { -38344, 0, -37800, 0, -36000, 0, -36000, 1800 } - typeMap:bin { "010302030203020302030203020302030203020302030203020302" } + transPre32:intvector { -1, 2085412040 } + trans:intvector { -543072056, 279714600, 289387800, 309952800, 320837400, 341402400, 352287000, 372852000, 384341400, 404906400, 415791000, 436356000, 447240600, 467805600, 478690200, 499255200, 510139800, 530704800, 541589400, 562154400, 573643800, 594208800, 605093400, 625658400, 636543000, 657108000, 667992600 } + typeOffsets:intvector { 48056, 0, -38344, 0, -37800, 0, -36000, 0, -36000, 1800 } + typeMap:bin { "01020403040304030403040304030403040304030403040304030403" } } //Z#585 /* Pacific/Saipan */ :int { 566 } //Z#586 /* Pacific/Samoa */ :int { 579 } //Z#587 @@ -2742,9 +2738,8 @@ zoneinfo64:table(nofallback) { typeMap:bin { "01" } } //Z#589 /* Pacific/Tongatapu */ :table { - transPre32:intvector { -1, 2117470136 } - trans:intvector { -915193200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400, 1478350800, 1484398800 } - typeOffsets:intvector { 44360, 0, 44400, 0, 46800, 0, 46800, 3600 } + trans:intvector { -767189952, -284041200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400, 1478350800, 1484398800 } + typeOffsets:intvector { 44352, 0, 44400, 0, 46800, 0, 46800, 3600 } typeMap:bin { "01020302030203020302" } } //Z#590 /* Pacific/Truk */ :int { 556 } //Z#591 @@ -3101,7 +3096,7 @@ zoneinfo64:table(nofallback) { 2, 20, 0, 86400, 0, 8, 20, 0, 86400, 0, 3600 } //_#13 Jordan:intvector { - 2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600 + 1, -29, -5, 86400, 0, 9, -31, -6, 0, 1, 3600 } //_#14 LH:intvector { 9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800 @@ -3139,12 +3134,9 @@ zoneinfo64:table(nofallback) { US:intvector { 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 } //_#26 - WS:intvector { - 8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600 - } //_#27 Zion:intvector { 2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#28 + } //_#27 } Regions:array { "AU", //Z#0 ACT diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 0bb881cfa6..37501e986b 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -175,17 +175,21 @@ it.ao // aq : https://en.wikipedia.org/wiki/.aq aq -// ar : https://nic.ar/nic-argentina/normativa-vigente +// ar : https://nic.ar/es/nic-argentina/normativa ar +bet.ar com.ar +coop.ar edu.ar gob.ar gov.ar int.ar mil.ar musica.ar +mutual.ar net.ar org.ar +senasa.ar tur.ar // arpa : https://en.wikipedia.org/wiki/.arpa @@ -6202,29 +6206,22 @@ gov.tm mil.tm edu.tm -// tn : https://en.wikipedia.org/wiki/.tn -// http://whois.ati.tn/ +// tn : http://www.registre.tn/fr/ +// https://whois.ati.tn/ tn com.tn ens.tn fin.tn gov.tn ind.tn +info.tn intl.tn +mincom.tn nat.tn net.tn org.tn -info.tn perso.tn tourism.tn -edunet.tn -rnrt.tn -rns.tn -rnu.tn -mincom.tn -agrinet.tn -defense.tn -turen.tn // to : https://en.wikipedia.org/wiki/.to // Submitted by registry @@ -11082,8 +11079,8 @@ cloudcontrolled.com cloudcontrolapp.com // Cloudera, Inc. : https://www.cloudera.com/ -// Submitted by Philip Langdale -cloudera.site +// Submitted by Kedarnath Waikar +*.cloudera.site // Cloudflare, Inc. : https://www.cloudflare.com/ // Submitted by Cloudflare Team @@ -11258,6 +11255,11 @@ deno-staging.dev // Submitted by Peter Thomassen dedyn.io +// Diher Solutions : https://diher.solutions +// Submitted by Didi Hermawan +*.rss.my.id +*.diher.solutions + // DNS Africa Ltd https://dns.business // Submitted by Calvin Browne jozi.biz @@ -11610,6 +11612,10 @@ definima.io // Submitted by Braxton Huggins ondigitalocean.app +// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/ +// Submitted by Robin H. Johnson +*.digitaloceanspaces.com + // dnstrace.pro : https://dnstrace.pro/ // Submitted by Chris Partridge bci.dnstrace.pro @@ -11676,11 +11682,6 @@ staging.onred.one // Submitted by Jacob Bunk Nielsen service.one -// Enonic : http://enonic.com/ -// Submitted by Erik Kaareng-Sunde -enonic.io -customer.enonic.io - // EU.org https://eu.org/ // Submitted by Pierre Beyssac eu.org @@ -12189,6 +12190,10 @@ hashbang.sh hasura.app hasura-app.io +// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages): https://www.hs-heilbronn.de +// Submitted by Richard Zowalla +pages.it.hs-heilbronn.de + // Hepforge : https://www.hepforge.org // Submitted by David Grellscheid hepforge.org @@ -12534,6 +12539,10 @@ loginline.io loginline.services loginline.site +// Lokalized : https://lokalized.nl +// Submitted by Noah Taheij +servers.run + // Lõhmus Family, The // Submitted by Heiki Lõhmus lohmus.me @@ -12574,6 +12583,7 @@ barsy.online barsy.org barsy.pro barsy.pub +barsy.ro barsy.shop barsy.site barsy.support @@ -12721,10 +12731,6 @@ that.win from.work to.work -// NCTU.ME : https://nctu.me/ -// Submitted by Tocknicsu -nctu.me - // Netlify : https://www.netlify.com // Submitted by Jessica Parsons netlify.app @@ -13107,6 +13113,10 @@ qbuser.com // Submitted by Scott Claeys cloudsite.builders +// Redgate Software: https://red-gate.com +// Submitted by Andrew Farries +instances.spawn.cc + // Redstar Consultants : https://www.redstarconsultants.com/ // Submitted by Jons Slemmer instantcloud.cn @@ -13455,6 +13465,10 @@ synology.me vpnplus.to direct.quickconnect.to +// Tabit Technologies Ltd. : https://tabit.cloud/ +// Submitted by Oren Agiv +tabitorder.co.il + // TAIFUN Software AG : http://taifun-software.de // Submitted by Bjoern Henke taifun-dns.de @@ -13714,6 +13728,12 @@ diskussionsbereich.de community-pro.net meinforum.net +// Woods Valldata : https://www.woodsvalldata.co.uk/ +// Submitted by Chris Whittle +affinitylottery.org.uk +raffleentry.org.uk +weeklylottery.org.uk + // WP Engine : https://wpengine.com/ // Submitted by Michael Smith // Submitted by Brandon DuRette diff --git a/netwerk/protocol/http/Http2Compression.cpp b/netwerk/protocol/http/Http2Compression.cpp index ebe1e72e00..419761e2ae 100644 --- a/netwerk/protocol/http/Http2Compression.cpp +++ b/netwerk/protocol/http/Http2Compression.cpp @@ -544,6 +544,18 @@ Http2Decompressor::OutputHeader(const nsACString &name, const nsACString &value) return NS_OK; } + // Bug 1663836: reject invalid HTTP response header names - RFC7540 Sec 10.3 + const char* cFirst = name.BeginReading(); + if (cFirst != nullptr && *cFirst == ':') { + ++cFirst; + } + if (!nsHttp::IsValidToken(cFirst, name.EndReading())) { + nsCString toLog(name); + LOG(("HTTP Decompressor invalid response header found. [%s]\n", + toLog.get())); + return NS_ERROR_ILLEGAL_VALUE; + } + // Look for upper case characters in the name. for (const char *cPtr = name.BeginReading(); cPtr && cPtr < name.EndReading();