Bug 1253699 - Use transaction to determine end-to-end tls when proxying. r?mcmanus draft
authorNicholas Hurley <hurley@todesschaf.org>
Wed, 27 Jul 2016 10:00:21 -0700
changeset 393324 33a46fac2f7099b53866e04485201767fced27fb
parent 392950 ceb63dec9267e9bb62f5e5e1f4c9d32d3ac1fbac
child 526561 2c677c27a8f5a3187a6b1a4cbd2cef43b4e0b3e7
push id24284
push userbmo:hurley@todesschaf.org
push dateWed, 27 Jul 2016 17:05:14 +0000
reviewersmcmanus
bugs1253699
milestone50.0a1
Bug 1253699 - Use transaction to determine end-to-end tls when proxying. r?mcmanus MozReview-Commit-ID: 5Q87t5sQKBf
netwerk/protocol/http/nsHttpConnection.cpp
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -402,17 +402,17 @@ nsHttpConnection::Activate(nsAHttpTransa
     mIdleMonitoring = false;
 
     // set mKeepAlive according to what will be requested
     mKeepAliveMask = mKeepAlive = (caps & NS_HTTP_ALLOW_KEEPALIVE);
 
     // need to handle HTTP CONNECT tunnels if this is the first time if
     // we are tunneling through a proxy
     nsresult rv = NS_OK;
-    if (mConnInfo->UsingConnect() && !mCompletedProxyConnect) {
+    if (mTransaction->ConnectionInfo()->UsingConnect() && !mCompletedProxyConnect) {
         rv = SetupProxyConnect();
         if (NS_FAILED(rv))
             goto failed_activation;
         mProxyConnectInProgress = true;
     }
 
     // Clear the per activation counter
     mCurrentBytesRead = 0;