Bug 1351392 - Fix NS_STATUS_TLS_HANDSHAKE_STARTING/ENDED transport status events for http2 and ftp. r=mcmanus, a=gchang
authorDragana Damjanovic dd.mozilla@gmail.com
Tue, 28 Mar 2017 10:36:00 +0800
changeset 395639 f82da404520a3a60a58b8f7f2df5db9edd96bebb
parent 395638 18015fe9a21fa50c437953325fda6787ce2f1994
child 395640 7a069a170c51b1b42f85a2d82a416811c3d5e054
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus, gchang
bugs1351392
milestone54.0a2
Bug 1351392 - Fix NS_STATUS_TLS_HANDSHAKE_STARTING/ENDED transport status events for http2 and ftp. r=mcmanus, a=gchang
netwerk/protocol/ftp/nsFtpConnectionThread.cpp
netwerk/protocol/http/Http2Session.cpp
--- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
+++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
@@ -2019,16 +2019,18 @@ nsFtpState::OnTransportStatus(nsITranspo
 
     // Ignore data transfer events on the control connection.
     if (mControlConnection && transport == mControlConnection->Transport()) {
         switch (status) {
         case NS_NET_STATUS_RESOLVING_HOST:
         case NS_NET_STATUS_RESOLVED_HOST:
         case NS_NET_STATUS_CONNECTING_TO:
         case NS_NET_STATUS_CONNECTED_TO:
+        case NS_NET_STATUS_TLS_HANDSHAKE_STARTING:
+        case NS_NET_STATUS_TLS_HANDSHAKE_ENDED:
             break;
         default:
             return NS_OK;
         }
     }
 
     // Ignore the progressMax value from the socket.  We know the true size of
     // the file based on the response from our SIZE request. Additionally, only
--- a/netwerk/protocol/http/Http2Session.cpp
+++ b/netwerk/protocol/http/Http2Session.cpp
@@ -2288,16 +2288,18 @@ Http2Session::OnTransportStatus(nsITrans
 
   switch (aStatus) {
     // These should appear only once, deliver to the first
     // transaction on the session.
   case NS_NET_STATUS_RESOLVING_HOST:
   case NS_NET_STATUS_RESOLVED_HOST:
   case NS_NET_STATUS_CONNECTING_TO:
   case NS_NET_STATUS_CONNECTED_TO:
+  case NS_NET_STATUS_TLS_HANDSHAKE_STARTING:
+  case NS_NET_STATUS_TLS_HANDSHAKE_ENDED:
   {
     Http2Stream *target = mStreamIDHash.Get(1);
     nsAHttpTransaction *transaction = target ? target->Transaction() : nullptr;
     if (transaction)
       transaction->OnTransportStatus(aTransport, aStatus, aProgress);
     break;
   }