author | Wei-Cheng Pan <wpan@mozilla.com> |
Thu, 27 Jul 2017 19:45:36 +0800 | |
changeset 371616 | de8759dd2b22a168169a51dd22575171f90db92a |
parent 371558 | 09a412e3cc3b1a1fd9a1325e161d36b91018ef24 |
child 371617 | a323aee88b0aebdd5c56c154615d7456ea21d527 |
push id | 32252 |
push user | kwierso@gmail.com |
push date | Sat, 29 Jul 2017 00:17:07 +0000 |
treeherder | mozilla-central@ec329722b2f8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mcmanus |
bugs | 1383748 |
milestone | 56.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
|
--- a/netwerk/protocol/http/nsHttpConnection.cpp +++ b/netwerk/protocol/http/nsHttpConnection.cpp @@ -282,48 +282,49 @@ nsHttpConnection::StartSpdy(uint8_t spdy // a server goaway was generated). mIsReused = true; // If mTransaction is a muxed object it might represent // several requests. If so, we need to unpack that and // pack them all into a new spdy session. nsTArray<RefPtr<nsAHttpTransaction> > list; - nsresult rv = NS_OK; + nsresult status = NS_OK; if (!mDid0RTTSpdy) { - rv = TryTakeSubTransactions(list); + status = TryTakeSubTransactions(list); - if (NS_FAILED(rv) && rv != NS_ERROR_NOT_IMPLEMENTED) { + if (NS_FAILED(status) && status != NS_ERROR_NOT_IMPLEMENTED) { return; } } if (NeedSpdyTunnel()) { LOG3(("nsHttpConnection::StartSpdy %p Connecting To a HTTP/2 " "Proxy and Need Connect", this)); MOZ_ASSERT(mProxyConnectStream); mProxyConnectStream = nullptr; mCompletedProxyConnect = true; mProxyConnectInProgress = false; } + nsresult rv = NS_OK; bool spdyProxy = mConnInfo->UsingHttpsProxy() && !mTLSFilter; if (spdyProxy) { RefPtr<nsHttpConnectionInfo> wildCardProxyCi; rv = mConnInfo->CreateWildCard(getter_AddRefs(wildCardProxyCi)); MOZ_ASSERT(NS_SUCCEEDED(rv)); gHttpHandler->ConnMgr()->MoveToWildCardConnEntry(mConnInfo, wildCardProxyCi, this); mConnInfo = wildCardProxyCi; MOZ_DIAGNOSTIC_ASSERT(mConnInfo); } if (!mDid0RTTSpdy) { - rv = MoveTransactionsToSpdy(rv, list); + rv = MoveTransactionsToSpdy(status, list); if (NS_FAILED(rv)) { return; } } // Disable TCP Keepalives - use SPDY ping instead. rv = DisableTCPKeepalives(); if (NS_FAILED(rv)) {