Merge remote-tracking branch 'origin/tracking' into custom

2026-09-07 00:08:39 +09:00 · 2022-11-10 14:55:46 +08:00 · 2022-11-10 14:55:46 +08:00 · f9dc0e6d15
commit f9dc0e6d15
parent fe4859b2c1 bf19c2087b
31 changed files with 913 additions and 892 deletions
--- a/config/external/icu/data/icudt63l.dat
+++ b/config/external/icu/data/icudt63l.dat
--- a/dom/fetch/FetchDriver.cpp
+++ b/dom/fetch/FetchDriver.cpp
@ -537,7 +537,8 @@ FetchDriver::OnStartRequest(nsIRequest* aRequest,
    nsAutoCString statusText;
    httpChannel->GetResponseStatusText(statusText);

-    response = new InternalResponse(responseStatus, statusText);
+    response = new InternalResponse(responseStatus, statusText,
+                                    mRequest->GetCredentialsMode());

    RefPtr<FillResponseHeaders> visitor = new FillResponseHeaders(response);
    rv = httpChannel->VisitResponseHeaders(visitor);
@ -556,7 +557,8 @@ FetchDriver::OnStartRequest(nsIRequest* aRequest,
    }
    MOZ_ASSERT(!result.Failed());
  } else {
-    response = new InternalResponse(200, NS_LITERAL_CSTRING("OK"));
+    response = new InternalResponse(200, NS_LITERAL_CSTRING("OK"),
+                                    mRequest->GetCredentialsMode());

    ErrorResult result;
    nsAutoCString contentType;
--- a/dom/fetch/InternalHeaders.cpp
+++ b/dom/fetch/InternalHeaders.cpp
@ -364,7 +364,7 @@ InternalHeaders::BasicHeaders(InternalHeaders* aHeaders)

 // static
 already_AddRefed<InternalHeaders>
-InternalHeaders::CORSHeaders(InternalHeaders* aHeaders)
+InternalHeaders::CORSHeaders(InternalHeaders* aHeaders, RequestCredentials aCredentialsMode)
 {
  RefPtr<InternalHeaders> cors = new InternalHeaders(aHeaders->mGuard);
  ErrorResult result;
@ -373,6 +373,7 @@ InternalHeaders::CORSHeaders(InternalHeaders* aHeaders)
  aHeaders->GetFirst(NS_LITERAL_CSTRING("Access-Control-Expose-Headers"), acExposedNames, result);
  MOZ_ASSERT(!result.Failed());

+  bool allowAllHeaders = false;
  AutoTArray<nsCString, 5> exposeNamesArray;
  nsCCharSeparatedTokenizer exposeTokens(acExposedNames, ',');
  while (exposeTokens.hasMoreTokens()) {
@ -388,19 +389,27 @@ InternalHeaders::CORSHeaders(InternalHeaders* aHeaders)
      break;
    }

+    if (token.EqualsLiteral("*") &&
+        aCredentialsMode != RequestCredentials::Include) {
+      allowAllHeaders = true;
+    }
+
    exposeNamesArray.AppendElement(token);
  }

  nsCaseInsensitiveCStringArrayComparator comp;
  for (uint32_t i = 0; i < aHeaders->mList.Length(); ++i) {
    const Entry& entry = aHeaders->mList[i];
-    if (entry.mName.EqualsASCII("cache-control") ||
-        entry.mName.EqualsASCII("content-language") ||
-        entry.mName.EqualsASCII("content-type") ||
-        entry.mName.EqualsASCII("expires") ||
-        entry.mName.EqualsASCII("last-modified") ||
-        entry.mName.EqualsASCII("pragma") ||
-        exposeNamesArray.Contains(entry.mName, comp)) {
+    if (allowAllHeaders) {
+      cors->Append(entry.mName, entry.mValue, result);
+      MOZ_ASSERT(!result.Failed());
+    } else if (entry.mName.EqualsASCII("cache-control") ||
+               entry.mName.EqualsASCII("content-language") ||
+               entry.mName.EqualsASCII("content-type") ||
+               entry.mName.EqualsASCII("expires") ||
+               entry.mName.EqualsASCII("last-modified") ||
+               entry.mName.EqualsASCII("pragma") ||
+               exposeNamesArray.Contains(entry.mName, comp)) {
      cors->Append(entry.mName, entry.mValue, result);
      MOZ_ASSERT(!result.Failed());
    }
--- a/dom/fetch/InternalHeaders.h
+++ b/dom/fetch/InternalHeaders.h
@ -8,6 +8,7 @@

 // needed for HeadersGuardEnum.
 #include "mozilla/dom/HeadersBinding.h"
+#include "mozilla/dom/RequestBinding.h"
 #include "mozilla/dom/UnionTypes.h"

 #include "nsClassHashtable.h"
@ -122,7 +123,8 @@ public:
  BasicHeaders(InternalHeaders* aHeaders);

  static already_AddRefed<InternalHeaders>
-  CORSHeaders(InternalHeaders* aHeaders);
+  CORSHeaders(InternalHeaders* aHeaders,
+              RequestCredentials mCredentialsMode = RequestCredentials::Omit);

  void
  GetEntries(nsTArray<InternalHeaders::Entry>& aEntries) const;
--- a/dom/fetch/InternalResponse.cpp
+++ b/dom/fetch/InternalResponse.cpp
@ -17,12 +17,15 @@
 namespace mozilla {
 namespace dom {

-InternalResponse::InternalResponse(uint16_t aStatus, const nsACString& aStatusText)
+InternalResponse::InternalResponse(uint16_t aStatus,
+                                   const nsACString& aStatusText,
+                                   RequestCredentials aCredentialsMode)
  : mType(ResponseType::Default)
  , mStatus(aStatus)
  , mStatusText(aStatusText)
  , mHeaders(new InternalHeaders(HeadersGuardEnum::Response))
  , mBodySize(UNKNOWN_BODY_SIZE)
+  , mCredentialsMode(aCredentialsMode)
 {
 }

@ -183,7 +186,7 @@ InternalResponse::CORSResponse()
  MOZ_ASSERT(!mWrappedResponse, "Can't CORSResponse a already wrapped response");
  RefPtr<InternalResponse> cors = CreateIncompleteCopy();
  cors->mType = ResponseType::Cors;
-  cors->mHeaders = InternalHeaders::CORSHeaders(Headers());
+  cors->mHeaders = InternalHeaders::CORSHeaders(Headers(), mCredentialsMode);
  cors->mWrappedResponse = this;
  return cors.forget();
 }
--- a/dom/fetch/InternalResponse.h
+++ b/dom/fetch/InternalResponse.h
@ -9,9 +9,10 @@
 #include "nsIInputStream.h"
 #include "nsISupportsImpl.h"

+#include "mozilla/dom/InternalHeaders.h"
+#include "mozilla/dom/RequestBinding.h"
 #include "mozilla/dom/ResponseBinding.h"
 #include "mozilla/dom/ChannelInfo.h"
-#include "mozilla/dom/InternalHeaders.h"
 #include "mozilla/UniquePtr.h"

 namespace mozilla {
@ -32,7 +33,9 @@ class InternalResponse final
 public:
  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(InternalResponse)

-  InternalResponse(uint16_t aStatus, const nsACString& aStatusText);
+  InternalResponse(uint16_t aStatus,
+                   const nsACString& aStatusText,
+                   RequestCredentials aCredentialsMode = RequestCredentials::Omit);

  static already_AddRefed<InternalResponse>
  FromIPC(const IPCInternalResponse& aIPCResponse);
@ -294,8 +297,11 @@ private:
  RefPtr<InternalHeaders> mHeaders;
  nsCOMPtr<nsIInputStream> mBody;
  int64_t mBodySize;
+  RequestCredentials mCredentialsMode;
+
 public:
  static const int64_t UNKNOWN_BODY_SIZE = -1;
+
 private:
  ChannelInfo mChannelInfo;
  UniquePtr<mozilla::ipc::PrincipalInfo> mPrincipalInfo;
--- a/dom/xhr/XMLHttpRequestMainThread.cpp
+++ b/dom/xhr/XMLHttpRequestMainThread.cpp
@ -1182,7 +1182,9 @@ XMLHttpRequestMainThread::IsSafeHeader(const nsACString& aHeader,
    if (!NS_IsValidHTTPToken(token)) {
      return false;
    }
-    if (aHeader.Equals(token, nsCaseInsensitiveCStringComparator())) {
+    if (token.EqualsLiteral("*") && !mFlagACwithCredentials) {
+      isSafe = true;
+    } else if (aHeader.Equals(token, nsCaseInsensitiveCStringComparator())) {
      isSafe = true;
    }
  }
--- a/intl/tzdata/GIT-INFO
+++ b/intl/tzdata/GIT-INFO
@ -1,7 +1,5 @@
-commit 95120170afa0cf622a18da37d3af58abf8ecd40e
-Author: Yoshito Umaoka <yumaoka@users.noreply.github.com>
-Date:   Wed Jan 27 09:48:37 2021 -0500
+commit 51ebdd3f0f5a774050e3ebc745b5fbea2f87f26b
+Author: yumaoka <y.umaoka@gmail.com>
+Date:   Tue Nov 1 10:29:13 2022 -0400

-    ICU-21467 tzdata 2021a updates. Also updated build script. With this … (#17)
-    
-    change, we no longer release ICU time zone data updates for ICU 4.2 or older releases.
+    ICU-22196 TZ Database 2022f updates (icu-data)
--- a/intl/tzdata/VERSION
+++ b/intl/tzdata/VERSION
@ -1 +1 @@
-2021a
+2022e
--- a/intl/tzdata/source/be/metaZones.res
+++ b/intl/tzdata/source/be/metaZones.res
--- a/intl/tzdata/source/be/timezoneTypes.res
+++ b/intl/tzdata/source/be/timezoneTypes.res
--- a/intl/tzdata/source/be/windowsZones.res
+++ b/intl/tzdata/source/be/windowsZones.res
--- a/intl/tzdata/source/be/zoneinfo64.res
+++ b/intl/tzdata/source/be/zoneinfo64.res
--- a/intl/tzdata/source/ee/metaZones.res
+++ b/intl/tzdata/source/ee/metaZones.res
--- a/intl/tzdata/source/ee/timezoneTypes.res
+++ b/intl/tzdata/source/ee/timezoneTypes.res
--- a/intl/tzdata/source/ee/windowsZones.res
+++ b/intl/tzdata/source/ee/windowsZones.res
--- a/intl/tzdata/source/ee/zoneinfo64.res
+++ b/intl/tzdata/source/ee/zoneinfo64.res
--- a/intl/tzdata/source/le/metaZones.res
+++ b/intl/tzdata/source/le/metaZones.res
--- a/intl/tzdata/source/le/timezoneTypes.res
+++ b/intl/tzdata/source/le/timezoneTypes.res
--- a/intl/tzdata/source/le/windowsZones.res
+++ b/intl/tzdata/source/le/windowsZones.res
--- a/intl/tzdata/source/le/zoneinfo64.res
+++ b/intl/tzdata/source/le/zoneinfo64.res
--- a/intl/tzdata/source/metaZones.txt
+++ b/intl/tzdata/source/metaZones.txt
@ -305,9 +305,7 @@ metaZones:table(nofallback){
            EG{"Africa/Cairo"}
            FI{"Europe/Helsinki"}
            GR{"Europe/Athens"}
-            JO{"Asia/Amman"}
            LB{"Asia/Beirut"}
-            SY{"Asia/Damascus"}
        }
        Europe_Further_Eastern{
            001{"Europe/Minsk"}
@ -708,9 +706,170 @@ metaZones:table(nofallback){
            001{"Asia/Yerevan"}
        }
        Yukon{
-            001{"America/Yakutat"}
+            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"}
+        yuko{"Yukon"}
+    }
    metazoneInfo{
        "Africa:Abidjan"{
            {
@ -1132,11 +1291,6 @@ metaZones:table(nofallback){
                "1970-01-01 00:00",
                "1983-10-30 11:00",
            }
-            {
-                "Yukon",
-                "1983-10-30 11:00",
-                "1983-11-30 09:00",
-            }
            {
                "Alaska",
                "1983-11-30 09:00",
@ -1552,18 +1706,13 @@ metaZones:table(nofallback){
            }
        }
        "America:Dawson"{
-            {
-                "Yukon",
-                "1970-01-01 00:00",
-                "1973-10-28 09:00",
-            }
            {
                "America_Pacific",
                "1973-10-28 09:00",
                "2020-11-01 07:00",
            }
            {
-                "America_Mountain",
+                "Yukon",
                "2020-11-01 07:00",
                "9999-12-31 23:59",
            }
@ -1894,21 +2043,11 @@ metaZones:table(nofallback){
                "1970-01-01 00:00",
                "1980-04-27 10:00",
            }
-            {
-                "Yukon",
-                "1980-04-27 10:00",
-                "1980-10-26 10:00",
-            }
            {
                "America_Pacific",
                "1980-10-26 10:00",
                "1983-10-30 09:00",
            }
-            {
-                "Yukon",
-                "1983-10-30 09:00",
-                "1983-11-30 09:00",
-            }
            {
                "Alaska",
                "1983-11-30 09:00",
@ -2169,11 +2308,6 @@ metaZones:table(nofallback){
                "1970-01-01 00:00",
                "1983-10-30 12:00",
            }
-            {
-                "Yukon",
-                "1983-10-30 12:00",
-                "1983-11-30 09:00",
-            }
            {
                "Alaska",
                "1983-11-30 09:00",
@ -2447,11 +2581,6 @@ metaZones:table(nofallback){
                "1970-01-01 00:00",
                "1983-10-30 09:00",
            }
-            {
-                "Yukon",
-                "1983-10-30 09:00",
-                "1983-11-30 09:00",
-            }
            {
                "Alaska",
                "1983-11-30 09:00",
@ -2542,7 +2671,7 @@ metaZones:table(nofallback){
                "2020-11-01 07:00",
            }
            {
-                "America_Mountain",
+                "Yukon",
                "2020-11-01 07:00",
                "9999-12-31 23:59",
            }
@ -2553,11 +2682,6 @@ metaZones:table(nofallback){
            }
        }
        "America:Yakutat"{
-            {
-                "Yukon",
-                "1970-01-01 00:00",
-                "1983-11-30 09:00",
-            }
            {
                "Alaska",
                "1983-11-30 09:00",
@ -2713,6 +2837,8 @@ metaZones:table(nofallback){
        "Asia:Amman"{
            {
                "Europe_Eastern",
+                "1970-01-01 00:00",
+                "2022-10-27 22:00",
            }
        }
        "Asia:Anadyr"{
@ -2900,6 +3026,8 @@ metaZones:table(nofallback){
        "Asia:Damascus"{
            {
                "Europe_Eastern",
+                "1970-01-01 00:00",
+                "2022-10-27 21:00",
            }
        }
        "Asia:Dhaka"{
@ -4007,16 +4135,11 @@ metaZones:table(nofallback){
            {
                "Moscow",
                "1970-01-01 00:00",
-                "1990-06-30 23:00",
-            }
-            {
-                "Europe_Central",
-                "1990-06-30 23:00",
-                "1991-03-31 02:00",
+                "1990-06-30 22:00",
            }
            {
                "Europe_Eastern",
-                "1991-03-31 02:00",
+                "1990-06-30 22:00",
                "9999-12-31 23:59",
            }
        }
@ -4076,11 +4199,11 @@ metaZones:table(nofallback){
            {
                "Moscow",
                "1970-01-01 00:00",
-                "1991-03-30 23:00",
+                "1990-06-30 22:00",
            }
            {
                "Europe_Eastern",
-                "1991-03-30 23:00",
+                "1990-06-30 22:00",
                "9999-12-31 23:59",
            }
        }
--- a/intl/tzdata/source/timezoneTypes.txt
+++ b/intl/tzdata/source/timezoneTypes.txt
@ -8,6 +8,7 @@ timezoneTypes:table(nofallback){
            cnckg{"cnsha"}
            cnhrb{"cnsha"}
            cnkhg{"cnurc"}
+            gaza{"gazastrp"}
            usnavajo{"usden"}
        }
    }
@ -86,12 +87,14 @@ timezoneTypes:table(nofallback){
            "Etc:Universal"{"Etc/UTC"}
            "Etc:Zulu"{"Etc/UTC"}
            "Europe:Belfast"{"Europe/London"}
+            "Europe:Kyiv"{"Europe/Kiev"}
            "Europe:Nicosia"{"Asia/Nicosia"}
            "Europe:Tiraspol"{"Europe/Chisinau"}
            "Mexico:BajaNorte"{"America/Tijuana"}
            "Mexico:BajaSur"{"America/Mazatlan"}
            "Mexico:General"{"America/Mexico_City"}
            "Pacific:Chuuk"{"Pacific/Truk"}
+            "Pacific:Kanton"{"Pacific/Enderbury"}
            "Pacific:Pohnpei"{"Pacific/Ponape"}
            "Pacific:Samoa"{"Pacific/Pago_Pago"}
            "Pacific:Yap"{"Pacific/Truk"}
@ -387,7 +390,7 @@ timezoneTypes:table(nofallback){
            "Asia:Dubai"{"aedxb"}
            "Asia:Dushanbe"{"tjdyu"}
            "Asia:Famagusta"{"cyfmg"}
-            "Asia:Gaza"{"gaza"}
+            "Asia:Gaza"{"gazastrp"}
            "Asia:Hebron"{"hebron"}
            "Asia:Hong_Kong"{"hkhkg"}
            "Asia:Hovd"{"mnhvd"}
--- a/intl/tzdata/source/windowsZones.txt
+++ b/intl/tzdata/source/windowsZones.txt
@ -304,6 +304,7 @@ windowsZones:table(nofallback){
            BF{"Africa/Ouagadougou"}
            CI{"Africa/Abidjan"}
            GH{"Africa/Accra"}
+            GL{"America/Danmarkshavn"}
            GM{"Africa/Banjul"}
            GN{"Africa/Conakry"}
            GW{"Africa/Bissau"}
@ -609,13 +610,16 @@ windowsZones:table(nofallback){
            MW{"Africa/Blantyre"}
            MZ{"Africa/Maputo"}
            RW{"Africa/Kigali"}
-            SS{"Africa/Juba"}
            SZ{"Africa/Mbabane"}
            ZA{"Africa/Johannesburg"}
            ZM{"Africa/Lusaka"}
            ZW{"Africa/Harare"}
            ZZ{"Etc/GMT-2"}
        }
+        "South Sudan Standard Time"{
+            001{"Africa/Juba"}
+            SS{"Africa/Juba"}
+        }
        "Sri Lanka Standard Time"{
            001{"Asia/Colombo"}
            LK{"Asia/Colombo"}
@ -674,14 +678,14 @@ windowsZones:table(nofallback){
        }
        "US Mountain Standard Time"{
            001{"America/Phoenix"}
+            CA{"America/Creston America/Dawson_Creek America/Fort_Nelson"}
            MX{"America/Hermosillo"}
            US{"America/Phoenix"}
            ZZ{"Etc/GMT+7"}
        }
        "UTC"{
-            001{"Etc/GMT"}
-            GL{"America/Danmarkshavn"}
-            ZZ{"Etc/GMT Etc/UTC"}
+            001{"Etc/UTC"}
+            ZZ{"Etc/UTC Etc/GMT"}
        }
        "UTC+12"{
            001{"Etc/GMT-12"}
@ -812,10 +816,7 @@ windowsZones:table(nofallback){
        }
        "Yukon Standard Time"{
            001{"America/Whitehorse"}
-            CA{
-                "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre"
-                "ek America/Fort_Nelson"
-            }
+            CA{"America/Whitehorse America/Dawson"}
        }
    }
 }
--- a/intl/tzdata/source/zoneinfo64.txt
+++ b/intl/tzdata/source/zoneinfo64.txt
--- a/js/src/builtin/IntlTimeZoneData.h
+++ b/js/src/builtin/IntlTimeZoneData.h
@ -1,5 +1,5 @@
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2021a
+// tzdata version = 2022e

 #ifndef builtin_IntlTimeZoneData_h
 #define builtin_IntlTimeZoneData_h
@ -18,7 +18,7 @@ const char* const ianaZonesTreatedAsLinksByICU[] = {
    "America/Argentina/Cordoba", // America/Cordoba [southamerica]
    "America/Argentina/Jujuy", // America/Jujuy [southamerica]
    "America/Argentina/Mendoza", // America/Mendoza [southamerica]
-    "America/Atikokan", // America/Coral_Harbour [northamerica]
+    "America/Atikokan", // America/Coral_Harbour [backzone]
    "America/Ensenada", // America/Tijuana [backzone]
    "America/Indiana/Indianapolis", // America/Indianapolis [northamerica]
    "America/Kentucky/Louisville", // America/Louisville [northamerica]
@ -36,11 +36,13 @@ const char* const ianaZonesTreatedAsLinksByICU[] = {
    "Atlantic/Jan_Mayen", // Arctic/Longyearbyen [backzone]
    "EST", // Etc/GMT+5 [northamerica]
    "Europe/Belfast", // Europe/London [backzone]
+    "Europe/Kyiv", // Europe/Kiev [europe]
    "Europe/Tiraspol", // Europe/Chisinau [backzone]
    "HST", // Etc/GMT+10 [northamerica]
    "MST", // Etc/GMT+7 [northamerica]
-    "Pacific/Chuuk", // Pacific/Truk [australasia]
-    "Pacific/Pohnpei", // Pacific/Ponape [australasia]
+    "Pacific/Chuuk", // Pacific/Truk [backzone]
+    "Pacific/Kanton", // Pacific/Enderbury [australasia]
+    "Pacific/Pohnpei", // Pacific/Ponape [backzone]
 };

 // Format:
@ -60,14 +62,13 @@ const LinkAndTarget ianaLinksCanonicalizedDifferentlyByICU[] = {
    { "America/Godthab", "America/Nuuk" }, // America/Godthab [backward]
    { "America/Indianapolis", "America/Indiana/Indianapolis" }, // America/Indianapolis [backward]
    { "America/Jujuy", "America/Argentina/Jujuy" }, // America/Jujuy [backward]
-    { "America/Kralendijk", "America/Curacao" }, // America/Kralendijk [southamerica]
+    { "America/Kralendijk", "America/Curacao" }, // America/Kralendijk [northamerica]
    { "America/Louisville", "America/Kentucky/Louisville" }, // America/Louisville [backward]
-    { "America/Lower_Princes", "America/Curacao" }, // America/Lower_Princes [southamerica]
-    { "America/Marigot", "America/Port_of_Spain" }, // America/Marigot [southamerica]
+    { "America/Lower_Princes", "America/Curacao" }, // America/Lower_Princes [northamerica]
+    { "America/Marigot", "America/Port_of_Spain" }, // America/Marigot [northamerica]
    { "America/Mendoza", "America/Argentina/Mendoza" }, // America/Mendoza [backward]
    { "America/Santa_Isabel", "America/Tijuana" }, // America/Santa_Isabel [backward]
-    { "America/St_Barthelemy", "America/Port_of_Spain" }, // America/St_Barthelemy [southamerica]
-    { "America/Virgin", "America/Port_of_Spain" }, // America/St_Thomas [backward]
+    { "America/St_Barthelemy", "America/Port_of_Spain" }, // America/St_Barthelemy [northamerica]
    { "Antarctica/South_Pole", "Antarctica/McMurdo" }, // Pacific/Auckland [backward]
    { "Arctic/Longyearbyen", "Europe/Oslo" }, // Arctic/Longyearbyen [europe]
    { "Asia/Calcutta", "Asia/Kolkata" }, // Asia/Calcutta [backward]
@ -78,6 +79,7 @@ const LinkAndTarget ianaLinksCanonicalizedDifferentlyByICU[] = {
    { "Atlantic/Faeroe", "Atlantic/Faroe" }, // Atlantic/Faeroe [backward]
    { "Europe/Bratislava", "Europe/Prague" }, // Europe/Bratislava [europe]
    { "Europe/Busingen", "Europe/Zurich" }, // Europe/Busingen [europe]
+    { "Europe/Kiev", "Europe/Kyiv" }, // Europe/Kiev [backward]
    { "Europe/Mariehamn", "Europe/Helsinki" }, // Europe/Mariehamn [europe]
    { "Europe/Podgorica", "Europe/Belgrade" }, // Europe/Podgorica [europe]
    { "Europe/San_Marino", "Europe/Rome" }, // Europe/San_Marino [europe]
@ -106,6 +108,8 @@ const char* const legacyICUTimeZones[] = {
    "Canada/East-Saskatchewan",
    "EAT",
    "ECT",
+    "Eire--ICU",
+    "Europe/Bratislava--ICU",
    "IET",
    "IST",
    "JST",
@ -118,6 +122,9 @@ const char* const legacyICUTimeZones[] = {
    "PST",
    "SST",
    "VST",
+    "Africa/Windhoek--ICU",
+    "Europe/Dublin--ICU",
+    "Europe/Prague--ICU",
    "SystemV/AST4",
    "SystemV/AST4ADT",
    "SystemV/CST6",
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_backward_links.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_backward_links.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2021a
+// tzdata version = 2022e

 const tzMapper = [
    x => x,
@ -26,7 +26,7 @@ const links = {
    "America/Porto_Acre": "America/Rio_Branco",
    "America/Santa_Isabel": "America/Tijuana",
    "America/Shiprock": "America/Denver",
-    "America/Virgin": "America/Port_of_Spain",
+    "America/Virgin": "America/St_Thomas",
    "Antarctica/South_Pole": "Antarctica/McMurdo",
    "Asia/Ashkhabad": "Asia/Ashgabat",
    "Asia/Calcutta": "Asia/Kolkata",
@ -69,6 +69,7 @@ const links = {
    "Egypt": "Africa/Cairo",
    "Eire": "Europe/Dublin",
    "Etc/UCT": "Etc/UTC",
+    "Europe/Kiev": "Europe/Kyiv",
    "GB": "Europe/London",
    "GB-Eire": "Europe/London",
    "GMT+0": "Etc/GMT",
@ -112,6 +113,7 @@ const links = {
    "US/Michigan": "America/Detroit",
    "US/Mountain": "America/Denver",
    "US/Pacific": "America/Los_Angeles",
+    "US/Pacific-New": "America/Los_Angeles",
    "US/Samoa": "Pacific/Pago_Pago",
    "UTC": "Etc/UTC",
    "Universal": "Etc/UTC",
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_backzone.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_backzone.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2021a
+// tzdata version = 2022e

 const tzMapper = [
    x => x,
@ -15,6 +15,7 @@ const tzMapper = [

 // Backzone zones derived from IANA Time Zone Database.
 const links = {
+    "Africa/Accra": "Africa/Accra",
    "Africa/Addis_Ababa": "Africa/Addis_Ababa",
    "Africa/Asmara": "Africa/Asmara",
    "Africa/Bamako": "Africa/Bamako",
@ -52,50 +53,82 @@ const links = {
    "America/Antigua": "America/Antigua",
    "America/Argentina/ComodRivadavia": "America/Argentina/ComodRivadavia",
    "America/Aruba": "America/Aruba",
+    "America/Atikokan": "America/Atikokan",
+    "America/Blanc-Sablon": "America/Blanc-Sablon",
    "America/Cayman": "America/Cayman",
    "America/Coral_Harbour": "America/Coral_Harbour",
+    "America/Creston": "America/Creston",
+    "America/Curacao": "America/Curacao",
    "America/Dominica": "America/Dominica",
    "America/Ensenada": "America/Ensenada",
    "America/Grenada": "America/Grenada",
    "America/Guadeloupe": "America/Guadeloupe",
    "America/Montreal": "America/Montreal",
    "America/Montserrat": "America/Montserrat",
+    "America/Nassau": "America/Nassau",
+    "America/Port_of_Spain": "America/Port_of_Spain",
    "America/Rosario": "America/Rosario",
    "America/St_Kitts": "America/St_Kitts",
    "America/St_Lucia": "America/St_Lucia",
    "America/St_Thomas": "America/St_Thomas",
    "America/St_Vincent": "America/St_Vincent",
    "America/Tortola": "America/Tortola",
+    "Antarctica/DumontDUrville": "Antarctica/DumontDUrville",
    "Antarctica/McMurdo": "Antarctica/McMurdo",
+    "Antarctica/Syowa": "Antarctica/Syowa",
+    "Antarctica/Vostok": "Antarctica/Vostok",
    "Asia/Aden": "Asia/Aden",
    "Asia/Bahrain": "Asia/Bahrain",
+    "Asia/Brunei": "Asia/Brunei",
    "Asia/Chongqing": "Asia/Chongqing",
    "Asia/Harbin": "Asia/Harbin",
    "Asia/Kashgar": "Asia/Kashgar",
+    "Asia/Kuala_Lumpur": "Asia/Kuala_Lumpur",
    "Asia/Kuwait": "Asia/Kuwait",
    "Asia/Muscat": "Asia/Muscat",
    "Asia/Phnom_Penh": "Asia/Phnom_Penh",
    "Asia/Tel_Aviv": "Asia/Tel_Aviv",
    "Asia/Vientiane": "Asia/Vientiane",
    "Atlantic/Jan_Mayen": "Atlantic/Jan_Mayen",
+    "Atlantic/Reykjavik": "Atlantic/Reykjavik",
    "Atlantic/St_Helena": "Atlantic/St_Helena",
    "Australia/Currie": "Australia/Currie",
+    "Europe/Amsterdam": "Europe/Amsterdam",
    "Europe/Belfast": "Europe/Belfast",
+    "Europe/Copenhagen": "Europe/Copenhagen",
    "Europe/Guernsey": "Europe/Guernsey",
    "Europe/Isle_of_Man": "Europe/Isle_of_Man",
    "Europe/Jersey": "Europe/Jersey",
    "Europe/Ljubljana": "Europe/Ljubljana",
+    "Europe/Luxembourg": "Europe/Luxembourg",
+    "Europe/Monaco": "Europe/Monaco",
+    "Europe/Oslo": "Europe/Oslo",
    "Europe/Sarajevo": "Europe/Sarajevo",
    "Europe/Skopje": "Europe/Skopje",
+    "Europe/Stockholm": "Europe/Stockholm",
    "Europe/Tiraspol": "Europe/Tiraspol",
+    "Europe/Uzhgorod": "Europe/Uzhgorod",
    "Europe/Vaduz": "Europe/Vaduz",
    "Europe/Zagreb": "Europe/Zagreb",
+    "Europe/Zaporozhye": "Europe/Zaporozhye",
    "Indian/Antananarivo": "Indian/Antananarivo",
+    "Indian/Christmas": "Indian/Christmas",
+    "Indian/Cocos": "Indian/Cocos",
    "Indian/Comoro": "Indian/Comoro",
+    "Indian/Kerguelen": "Indian/Kerguelen",
+    "Indian/Mahe": "Indian/Mahe",
    "Indian/Mayotte": "Indian/Mayotte",
+    "Indian/Reunion": "Indian/Reunion",
+    "Pacific/Chuuk": "Pacific/Chuuk",
+    "Pacific/Enderbury": "Pacific/Enderbury",
+    "Pacific/Funafuti": "Pacific/Funafuti",
    "Pacific/Johnston": "Pacific/Johnston",
+    "Pacific/Majuro": "Pacific/Majuro",
    "Pacific/Midway": "Pacific/Midway",
+    "Pacific/Pohnpei": "Pacific/Pohnpei",
    "Pacific/Saipan": "Pacific/Saipan",
+    "Pacific/Wake": "Pacific/Wake",
+    "Pacific/Wallis": "Pacific/Wallis",
 };

 for (let [linkName, target] of Object.entries(links)) {
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_backzone_links.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_backzone_links.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2021a
+// tzdata version = 2022e

 const tzMapper = [
    x => x,
@ -17,8 +17,18 @@ const tzMapper = [
 // Backzone links derived from IANA Time Zone Database.
 const links = {
    "Africa/Asmera": "Africa/Asmara",
+    "America/Kralendijk": "America/Curacao",
+    "America/Lower_Princes": "America/Curacao",
+    "America/Marigot": "America/Port_of_Spain",
+    "America/St_Barthelemy": "America/Port_of_Spain",
+    "America/Virgin": "America/St_Thomas",
    "Antarctica/South_Pole": "Antarctica/McMurdo",
+    "Arctic/Longyearbyen": "Europe/Oslo",
    "Asia/Chungking": "Asia/Chongqing",
+    "Iceland": "Atlantic/Reykjavik",
+    "Pacific/Ponape": "Pacific/Pohnpei",
+    "Pacific/Truk": "Pacific/Chuuk",
+    "Pacific/Yap": "Pacific/Chuuk",
 };

 for (let [linkName, target] of Object.entries(links)) {
--- a/js/src/tests/Intl/DateTimeFormat/timeZone_notbackward_links.js
+++ b/js/src/tests/Intl/DateTimeFormat/timeZone_notbackward_links.js
@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))

 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2021a
+// tzdata version = 2022e

 const tzMapper = [
    x => x,
@ -31,7 +31,6 @@ const links = {
    "Europe/San_Marino": "Europe/Rome",
    "Europe/Vatican": "Europe/Rome",
    "GMT": "Etc/GMT",
-    "US/Pacific-New": "America/Los_Angeles",
 };

 for (let [linkName, target] of Object.entries(links)) {
--- a/netwerk/protocol/http/nsCORSListenerProxy.cpp
+++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp
@ -1169,7 +1169,8 @@ nsCORSPreflightListener::AddResultToCache(nsIRequest *aRequest)
    }
    uint32_t i;
    for (i = 0; i < entry->mMethods.Length(); ++i) {
-      if (entry->mMethods[i].token.Equals(method)) {
+      if ((entry->mMethods[i].token.EqualsLiteral("*") && !mWithCredentials) ||
+          entry->mMethods[i].token.Equals(method)) {
        entry->mMethods[i].expirationTime = expirationTime;
        break;
      }
@ -1199,7 +1200,8 @@ nsCORSPreflightListener::AddResultToCache(nsIRequest *aRequest)
    }
    uint32_t i;
    for (i = 0; i < entry->mHeaders.Length(); ++i) {
-      if (entry->mHeaders[i].token.Equals(header)) {
+      if ((entry->mHeaders[i].token.EqualsLiteral("*") && !mWithCredentials) ||
+          entry->mHeaders[i].token.Equals(header)) {
        entry->mHeaders[i].expirationTime = expirationTime;
        break;
      }
@ -1325,7 +1327,11 @@ nsCORSPreflightListener::CheckPreflightRequestApproved(nsIRequest* aRequest)
                        NS_ConvertUTF8toUTF16(method).get());
      return NS_ERROR_DOM_BAD_URI;
    }
-    foundMethod |= mPreflightMethod.Equals(method);
+    if (method.EqualsLiteral("*") && !mWithCredentials) {
+      foundMethod = true;
+    } else {
+      foundMethod |= mPreflightMethod.Equals(method);
+    }
  }
  if (!foundMethod) {
    LogBlockedRequest(aRequest, "CORSMethodNotFound", nullptr);
@ -1338,6 +1344,7 @@ nsCORSPreflightListener::CheckPreflightRequestApproved(nsIRequest* aRequest)
                          headerVal);
  nsTArray<nsCString> headers;
  nsCCharSeparatedTokenizer headerTokens(headerVal, ',');
+  bool allowAllHeaders = false;
  while(headerTokens.hasMoreTokens()) {
    const nsDependentCSubstring& header = headerTokens.nextToken();
    if (header.IsEmpty()) {
@ -1348,14 +1355,20 @@ nsCORSPreflightListener::CheckPreflightRequestApproved(nsIRequest* aRequest)
                        NS_ConvertUTF8toUTF16(header).get());
      return NS_ERROR_DOM_BAD_URI;
    }
-    headers.AppendElement(header);
+    if (header.EqualsLiteral("*") && !mWithCredentials) {
+      allowAllHeaders = true;
+    } else {
+      headers.AppendElement(header);
+    }
  }
-  for (uint32_t i = 0; i < mPreflightHeaders.Length(); ++i) {
-    if (!headers.Contains(mPreflightHeaders[i],
-                          nsCaseInsensitiveCStringArrayComparator())) {
-      LogBlockedRequest(aRequest, "CORSMissingAllowHeaderFromPreflight",
-                        NS_ConvertUTF8toUTF16(mPreflightHeaders[i]).get());
-      return NS_ERROR_DOM_BAD_URI;
+  if (!allowAllHeaders) {
+    for (uint32_t i = 0; i < mPreflightHeaders.Length(); ++i) {
+      if (!headers.Contains(mPreflightHeaders[i],
+                            nsCaseInsensitiveCStringArrayComparator())) {
+        LogBlockedRequest(aRequest, "CORSMissingAllowHeaderFromPreflight",
+                          NS_ConvertUTF8toUTF16(mPreflightHeaders[i]).get());
+        return NS_ERROR_DOM_BAD_URI;
+      }
    }
  }
 @ -1 +1 @@
 a
 e