v121.0

.hgtags

@@ -4668,3 +4668,4 @@ c8602eedb54af9596786fffadd7e6362d241c4ee FIREFOX_121_0b7_RELEASE
 ab6d9d1dae754aeedf99fe61fe143ffc088b5801 FIREFOX_RELEASE_121_BASE
 2b1de81744a329b1b545b79875a9521b16b5ef03 FIREFOX_RELEASE_120_END
 8b7f7fd1873f56a4d755ea1fdcf46cbb18f9af27 FIREFOX_121_0_BUILD1
+8b7f7fd1873f56a4d755ea1fdcf46cbb18f9af27 FIREFOX_121_0_RELEASE

browser/config/version.txt

@@ -1 +1 @@
-121.0
+121.0.1

browser/config/version_display.txt

@@ -1 +1 @@
-121.0
+121.0.1

config/milestone.txt

@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-121.0
+121.0.1

dom/media/webrtc/transport/test/test_nr_socket_unittest.cpp

@@ -117,17 +117,20 @@ class TestNrSocketTest : public MtransportTest {
     MOZ_ASSERT(from);
 
     if (!WaitForWriteable(from)) {
+      std::cerr << "WaitForWriteable failed" << std::endl;
       return false;
     }
 
     int result = 0;
     SyncDispatchToSTS(WrapRunnableRet(
         &result, this, &TestNrSocketTest::SendData_s, from, via));
     if (result) {
+      std::cerr << "SendData_s failed" << std::endl;
       return false;
     }
 
     if (!WaitForReadable(to)) {
+      std::cerr << "WaitForReadable failed" << std::endl;
       return false;
     }
 
@@ -140,7 +143,9 @@ class TestNrSocketTest : public MtransportTest {
     SyncDispatchToSTS(WrapRunnableRet(&result, this,
                                       &TestNrSocketTest::RecvData_s, to,
                                       sender_external_address));
-
+    if (!result) {
+      std::cerr << "RecvData_s failed" << std::endl;
+    }
     return !result;
   }
 
@@ -731,7 +736,7 @@ TEST_F(TestNrSocketTest, FullConeTimeout) {
   RefPtr<TestNat> nat(CreatePrivateAddrs(1));
   nat->filtering_type_ = TestNat::ENDPOINT_INDEPENDENT;
   nat->mapping_type_ = TestNat::ENDPOINT_INDEPENDENT;
-  nat->mapping_timeout_ = 200;
+  nat->mapping_timeout_ = 400;
   CreatePublicAddrs(2);
 
   nr_transport_addr sender_external_address;
@@ -743,7 +748,7 @@ TEST_F(TestNrSocketTest, FullConeTimeout) {
   ASSERT_TRUE(CheckConnectivityVia(public_addrs_[0], private_addrs_[0],
                                    sender_external_address));
 
-  PR_Sleep(201);
+  PR_Sleep(401);
 
   // Verify that return traffic does not work
   ASSERT_FALSE(CheckConnectivityVia(public_addrs_[0], private_addrs_[0],

dom/media/webrtc/transport/test_nr_socket.cpp

@@ -448,19 +448,19 @@ bool TestNrSocket::allow_ingress(const nr_transport_addr& to,
   *port_mapping_used = nullptr;
   for (PortMapping* port_mapping : port_mappings_) {
     if (!nr_transport_addr_cmp(&to, &port_mapping->external_socket_->my_addr(),
-                               NR_TRANSPORT_ADDR_CMP_MODE_ALL)) {
+                               NR_TRANSPORT_ADDR_CMP_MODE_ALL) &&
+        !is_port_mapping_stale(*port_mapping)) {
       *port_mapping_used = port_mapping;
       // TODO: Bug 1857149
       // Adding a break here causes test failures, but we would not expect to
       // find more than one matching mapping at a time.
     }
   }
 
-  if (NS_WARN_IF(!(*port_mapping_used))) {
-    MOZ_ASSERT(false);
+  if (!(*port_mapping_used)) {
     r_log(LOG_GENERIC, LOG_INFO,
           "TestNrSocket %s denying ingress from %s: "
-          "No port mapping for this local port! What?",
+          "No non-stale port mapping for this local port.",
           internal_socket_->my_addr().as_string, from.as_string);
     return false;
   }
@@ -473,14 +473,6 @@ bool TestNrSocket::allow_ingress(const nr_transport_addr& to,
     return false;
   }
 
-  if (is_port_mapping_stale(**port_mapping_used)) {
-    r_log(LOG_GENERIC, LOG_INFO,
-          "TestNrSocket %s denying ingress from %s: "
-          "Stale port mapping",
-          internal_socket_->my_addr().as_string, from.as_string);
-    return false;
-  }
-
   if (!nat_->allow_hairpinning_ && nat_->is_my_external_tuple(from)) {
     r_log(LOG_GENERIC, LOG_INFO,
           "TestNrSocket %s denying ingress from %s: "
@@ -800,6 +792,12 @@ bool TestNrSocket::is_port_mapping_stale(
   PRIntervalTime now = PR_IntervalNow();
   PRIntervalTime elapsed_ticks = now - port_mapping.last_used_;
   uint32_t idle_duration = PR_IntervalToMilliseconds(elapsed_ticks);
+  r_log(LOG_GENERIC, LOG_INFO,
+        "TestNrSocket %s port mapping %s -> %s last used %u",
+        internal_socket_->my_addr().as_string,
+        port_mapping.external_socket_->my_addr().as_string,
+        port_mapping.remote_address_.as_string,
+        static_cast<unsigned>(idle_duration));
   return idle_duration > nat_->mapping_timeout_;
 }
 

python/mozboot/mozboot/android.py

@@ -825,18 +825,34 @@ def ensure_java(os_name, os_arch):
     if not java_path.exists():
         # e.g. https://github.com/adoptium/temurin17-binaries/releases/
         #      download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz
-        java_url = (
-            "https://github.com/adoptium/temurin{major}-binaries/releases/"
-            "download/jdk-{major}.{minor}%2B{patch}/"
-            "OpenJDK{major}U-jdk_{arch}_{os}_hotspot_{major}.{minor}_{patch}.{ext}"
-        ).format(
-            major=JAVA_VERSION_MAJOR,
-            minor=JAVA_VERSION_MINOR,
-            patch=JAVA_VERSION_PATCH,
-            os=os_tag,
-            arch=arch,
-            ext=ext,
-        )
+        if os_name != "windows":
+            java_url = (
+                "https://github.com/adoptium/temurin{major}-binaries/releases/"
+                "download/jdk-{major}.{minor}%2B{patch}/"
+                "OpenJDK{major}U-jdk_{arch}_{os}_hotspot_{major}.{minor}_{patch}.{ext}"
+            ).format(
+                major=JAVA_VERSION_MAJOR,
+                minor=JAVA_VERSION_MINOR,
+                patch=JAVA_VERSION_PATCH,
+                os=os_tag,
+                arch=arch,
+                ext=ext,
+            )
+        # Hack the URL for Windows due missed binary uploads for the original
+        # JDK 17.0.9 release. See bug 1870252.
+        else:
+            java_url = (
+                "https://github.com/adoptium/temurin{major}-binaries/releases/"
+                "download/jdk-{major}.{minor}%2B{patch}.1/"
+                "OpenJDK{major}U-jdk_{arch}_{os}_hotspot_{major}.{minor}_{patch}.{ext}"
+            ).format(
+                major=JAVA_VERSION_MAJOR,
+                minor=JAVA_VERSION_MINOR,
+                patch=JAVA_VERSION_PATCH,
+                os=os_tag,
+                arch=arch,
+                ext=ext,
+            )
         install_mobile_android_sdk_or_ndk(java_url, mozbuild_path / "jdk")
     return java_path
 

services/settings/dumps/blocklists/addons-bloomfilters.json

@@ -1,5 +1,18 @@
 {
   "data": [
+    {
+      "stash": {
+        "blocked": [
+          "{c35c913f-cf7a-4663-94f9-bb850b15f612}:1.0.0"
+        ],
+        "unblocked": []
+      },
+      "schema": 1702901354887,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1702989304450,
+      "id": "9f52a928-085e-4444-a3cb-afb57580790d",
+      "last_modified": 1702989358799
+    },
     {
       "stash": {
         "blocked": [
@@ -3207,5 +3220,5 @@
       "last_modified": 1690223886167
     }
   ],
-  "timestamp": 1702470957419
+  "timestamp": 1702989358799
 }