Backed out 2 changesets (bug 1734573) for causing failures on browser_net_brotli.js. CLOSED TREE

Backed out changeset 1b2194a0e1ec (bug 1734573)
Backed out changeset 51a00e9f45a3 (bug 1734573)

devtools/client/netmonitor/test/browser_net_brotli.js

@@ -44,10 +44,10 @@ add_task(async function() {
     HTTPS_CONTENT_TYPE_SJS + "?fmt=br",
     {
       status: 200,
-      statusText: "OK",
-      type: "json",
-      fullMimeType: "text/json",
-      transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 252),
+      statusText: "Connected",
+      type: "plain",
+      fullMimeType: "text/plain",
+      transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 60),
       size: L10N.getFormatStrWithNumbers("networkMenu.sizeB", 64),
       time: true,
     }

netwerk/protocol/http/nsHttpTransaction.cpp

@@ -1330,8 +1330,7 @@ bool nsHttpTransaction::ShouldRestartOn0RttError(nsresult reason) {
        this, mEarlyDataWasAvailable, static_cast<uint32_t>(reason)));
   return StaticPrefs::network_http_early_data_disable_on_error() &&
          mEarlyDataWasAvailable &&
-         (reason ==
-          psm::GetXPCOMFromNSSError(SSL_ERROR_PROTOCOL_VERSION_ALERT));
+         SecurityErrorToBeHandledByTransaction(reason);
 }
 
 void nsHttpTransaction::Close(nsresult reason) {
@@ -2396,26 +2395,19 @@ nsresult nsHttpTransaction::ProcessData(char* buf, uint32_t count,
     if (count && bytesConsumed) memmove(buf, buf + bytesConsumed, count);
 
     // report the completed response header
-    if (mActivityDistributor && mResponseHead && mHaveAllHeaders) {
-      auto reportResponseHeader = [&](uint32_t aSubType) {
+    if (mActivityDistributor && mResponseHead && mHaveAllHeaders &&
+        !mReportedResponseHeader) {
+      mReportedResponseHeader = true;
       nsAutoCString completeResponseHeaders;
       mResponseHead->Flatten(completeResponseHeaders, false);
       completeResponseHeaders.AppendLiteral("\r\n");
       rv = mActivityDistributor->ObserveActivityWithArgs(
-            HttpActivityArgs(mChannelId),
-            NS_HTTP_ACTIVITY_TYPE_HTTP_TRANSACTION, aSubType, PR_Now(), 0,
+          HttpActivityArgs(mChannelId), NS_HTTP_ACTIVITY_TYPE_HTTP_TRANSACTION,
+          NS_HTTP_ACTIVITY_SUBTYPE_RESPONSE_HEADER, PR_Now(), 0,
           completeResponseHeaders);
       if (NS_FAILED(rv)) {
         LOG3(("ObserveActivity failed (%08x)", static_cast<uint32_t>(rv)));
       }
-      };
-
-      if (mConnection->IsProxyConnectInProgress()) {
-        reportResponseHeader(NS_HTTP_ACTIVITY_SUBTYPE_PROXY_RESPONSE_HEADER);
-      } else if (!mReportedResponseHeader) {
-        mReportedResponseHeader = true;
-        reportResponseHeader(NS_HTTP_ACTIVITY_SUBTYPE_RESPONSE_HEADER);
-      }
     }
   }
 

netwerk/protocol/http/nsIHttpActivityObserver.idl

@@ -103,7 +103,6 @@ interface nsIHttpActivityObserver : nsISupports
     const unsigned long ACTIVITY_SUBTYPE_RESPONSE_HEADER   = 0x5004;
     const unsigned long ACTIVITY_SUBTYPE_RESPONSE_COMPLETE = 0x5005;
     const unsigned long ACTIVITY_SUBTYPE_TRANSACTION_CLOSE = 0x5006;
-    const unsigned long ACTIVITY_SUBTYPE_PROXY_RESPONSE_HEADER  = 0x5007;
 
     /**
      *  When aActivityType is ACTIVITY_TYPE_SOCKET_TRANSPORT
@@ -146,8 +145,6 @@ interface nsIHttpActivityObserver : nsISupports
             nsIHttpActivityObserver::ACTIVITY_SUBTYPE_RESPONSE_COMPLETE
 #define NS_HTTP_ACTIVITY_SUBTYPE_TRANSACTION_CLOSE \
             nsIHttpActivityObserver::ACTIVITY_SUBTYPE_TRANSACTION_CLOSE
-#define NS_HTTP_ACTIVITY_SUBTYPE_PROXY_RESPONSE_HEADER \
-            nsIHttpActivityObserver::ACTIVITY_SUBTYPE_PROXY_RESPONSE_HEADER
 
 %}