Bug 1344890 - need to set nsHttpTransaction.mSecurityInfo in Finish0RTT r=dragana a=gchang
authorPatrick McManus <mcmanus@ducksong.com>
Wed, 08 Mar 2017 13:18:24 -0500
changeset 395094 31fc9f769a8cc5033f95bd50e89d00396204f001
parent 395093 a5f9b43013e6557c917612510f46000458b34c40
child 395095 234d82a98acb5fe76be748697c9d6ef02fc38edb
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)
reviewersdragana, gchang
bugs1344890
milestone54.0a2
Bug 1344890 - need to set nsHttpTransaction.mSecurityInfo in Finish0RTT r=dragana a=gchang
netwerk/protocol/http/nsHttpTransaction.cpp
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -2110,25 +2110,30 @@ nsHttpTransaction::Do0RTT()
      m0RTTInProgress = true;
    }
    return m0RTTInProgress;
 }
 
 nsresult
 nsHttpTransaction::Finish0RTT(bool aRestart, bool aAlpnChanged /* ignored */)
 {
+    LOG(("nsHttpTransaction::Finish0RTT %p %d %d\n", this, aRestart, aAlpnChanged));
     MOZ_ASSERT(m0RTTInProgress);
     m0RTTInProgress = false;
     if (aRestart) {
         // Reset request headers to be sent again.
         nsCOMPtr<nsISeekableStream> seekable =
             do_QueryInterface(mRequestStream);
         if (seekable) {
             seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
         } else {
             return NS_ERROR_FAILURE;
         }
+    } else if (!mConnected) {
+        // this is code that was skipped in ::ReadSegments while in 0RTT
+        mConnected = true;
+        mConnection->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
     }
     return NS_OK;
 }
 
 } // namespace net
 } // namespace mozilla