Backed out changeset f4471f33a2c5 (bug 1704079) for xpcshell failures in test_http3_trans_close.js. CLOSED TREE

netwerk/protocol/http/Http3Session.cpp

@@ -1634,7 +1634,6 @@ void Http3Session::SetSecInfo() {
   if (NS_SUCCEEDED(mHttp3Connection->GetSecInfo(&secInfo))) {
     mSocketControl->SetSSLVersionUsed(secInfo.version);
     mSocketControl->SetResumed(secInfo.resumed);
-    mSocketControl->SetNegotiatedNPN(secInfo.alpn);
 
     mSocketControl->SetInfo(secInfo.cipher, secInfo.version, secInfo.group,
                             secInfo.signature_scheme);

netwerk/test/unit/test_http3.js

@@ -177,7 +177,7 @@ Http3CheckListener.prototype = {
       try {
         httpVersion = request.protocolVersion;
       } catch (e) {}
-      Assert.equal(httpVersion, "h3-27");
+      Assert.equal(httpVersion, "h3");
       Assert.equal(this.onDataAvailableFired, true);
       Assert.equal(request.getResponseHeader("X-Firefox-Http3"), "h3-27");
     }
@@ -212,7 +212,7 @@ WaitForHttp3Listener.prototype.onStopRequest = function testOnStopRequest(
 
   if (routed == this.expectedRoute) {
     Assert.equal(routed, this.expectedRoute); // always true, but a useful log
-    Assert.equal(httpVersion, "h3-27");
+    Assert.equal(httpVersion, "h3");
     run_next_test();
   } else {
     dump("poll later for alt svc mapping\n");
@@ -295,7 +295,7 @@ MultipleListener.prototype = {
       try {
         httpVersion = request.protocolVersion;
       } catch (e) {}
-      Assert.equal(httpVersion, "h3-27");
+      Assert.equal(httpVersion, "h3");
     }
 
     if (!Components.isSuccessCode(request.status)) {
@@ -498,7 +498,7 @@ SlowReceiverListener.prototype.onStopRequest = function(request, status) {
     try {
       httpVersion = request.protocolVersion;
     } catch (e) {}
-    Assert.equal(httpVersion, "h3-27");
+    Assert.equal(httpVersion, "h3");
     Assert.equal(this.onDataAvailableFired, true);
   }
   run_next_test();

netwerk/test/unit/test_http3_421.js

@@ -108,7 +108,7 @@ WaitForHttp3Listener.prototype.onStopRequest = function testOnStopRequest(
   Http3Listener.prototype.onStopRequest.call(this, request, status);
 
   if (this.routed == h3Route) {
-    Assert.equal(this.httpVersion, "h3-27");
+    Assert.equal(this.httpVersion, "h3");
     run_next_test();
   } else {
     dump("poll later for alt svc mapping\n");

netwerk/test/unit/test_http3_alt_svc.js

@@ -89,7 +89,7 @@ WaitForHttp3Listener.prototype = {
       try {
         httpVersion = request.protocolVersion;
       } catch (e) {}
-      Assert.equal(httpVersion, "h3-27");
+      Assert.equal(httpVersion, "h3");
       run_next_test();
     } else {
       dump("poll later for alt svc mapping\n");

netwerk/test/unit/test_http3_large_post.js

@@ -36,7 +36,7 @@ Http3Listener.prototype = {
     try {
       httpVersion = request.protocolVersion;
     } catch (e) {}
-    Assert.equal(httpVersion, "h3-27");
+    Assert.equal(httpVersion, "h3");
 
     this.finish();
   },

netwerk/test/unit/test_http3_perf.js

@@ -133,7 +133,7 @@ Http3CheckListener.prototype = {
     try {
       httpVersion = request.protocolVersion;
     } catch (e) {}
-    Assert.equal(httpVersion, "h3-27");
+    Assert.equal(httpVersion, "h3");
     Assert.equal(this.onDataAvailableFired, true);
   },
 };
@@ -163,7 +163,7 @@ WaitForHttp3Listener.prototype.onStopRequest = function testOnStopRequest(
     try {
       httpVersion = request.protocolVersion;
     } catch (e) {}
-    Assert.equal(httpVersion, "h3-27");
+    Assert.equal(httpVersion, "h3");
     run_next_test();
   } else {
     dump("poll later for alt svc mapping\n");

netwerk/test/unit/test_http3_trans_close.js

@@ -34,7 +34,7 @@ Http3Listener.prototype = {
     try {
       httpVersion = request.protocolVersion;
     } catch (e) {}
-    Assert.equal(httpVersion, "h3-27");
+    Assert.equal(httpVersion, "h3");
     Assert.equal(this.amount, this.expectedAmount);
 
     this.finish();

netwerk/test/unit/test_trr_https_fallback.js

@@ -601,7 +601,7 @@ add_task(async function testH3Connection() {
 
   let chan = makeChan(`https://test.h3.com`);
   let [req] = await channelOpenPromise(chan);
-  Assert.equal(req.protocolVersion, "h3-27");
+  Assert.equal(req.protocolVersion, "h3");
   let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
   Assert.equal(internal.remotePort, h3Port);
 
@@ -808,7 +808,7 @@ add_task(async function testHttp3ExcludedList() {
 
   chan = makeChan(`https://test.h3_excluded.org`);
   let [req] = await channelOpenPromise(chan);
-  Assert.equal(req.protocolVersion, "h3-27");
+  Assert.equal(req.protocolVersion, "h3");
   let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
   Assert.equal(internal.remotePort, h3Port);
 
@@ -933,7 +933,7 @@ add_task(async function testAllRecordsInHttp3ExcludedList() {
   // give the first record one more shot.
   chan = makeChan(`https://www.h3_all_excluded.org`);
   [req] = await channelOpenPromise(chan);
-  Assert.equal(req.protocolVersion, "h3-27");
+  Assert.equal(req.protocolVersion, "h3");
   let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
   Assert.equal(internal.remotePort, h3Port);