bug 528222 spdy - no npn when connecting to proxy r=honzab
authorPatrick McManus <mcmanus@ducksong.com>
Fri, 02 Dec 2011 10:28:57 -0500
changeset 81183 842ccf5f5de2497055d4ad83bed474235d1a0d77
parent 81182 d93829e39b3f39e2b8859bb436b171c13b1e06c8
child 81184 a267b3c9d217985b9af1a5f962af0db5735acee8
push id21564
push usermak77@bonardo.net
push dateSat, 03 Dec 2011 11:10:17 +0000
treeherdermozilla-central@a68c96c1d8e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershonzab
bugs528222
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 528222 spdy - no npn when connecting to proxy r=honzab patch 7
netwerk/protocol/http/nsHttpConnection.cpp
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -291,16 +291,17 @@ nsHttpConnection::SetupNPN(PRUint8 caps)
 
     // Setup NPN Negotiation if necessary (only for SPDY)
     if (!mNPNComplete) {
 
         mNPNComplete = true;
 
         if (mConnInfo->UsingSSL() &&
             !(caps & NS_HTTP_DISALLOW_SPDY) &&
+            !mConnInfo->UsingHttpProxy() &&
             gHttpHandler->IsSpdyEnabled()) {
             LOG(("nsHttpConnection::Init Setting up SPDY Negotiation"));
             nsCOMPtr<nsISupports> securityInfo;
             nsresult rv =
                 mSocketTransport->GetSecurityInfo(getter_AddRefs(securityInfo));
             if (NS_FAILED(rv))
                 return;