Back out 77c1b79c5bec (bug 1076129) for causing frequent xpcshell crashes. Again.
authorPhil Ringnalda <philringnalda@gmail.com>
Sat, 04 Oct 2014 13:58:25 -0700
changeset 232044 759811d71d329a026b60ee7f52f2c72d7db266cf
parent 232043 fa8375efaefcbba76647dbf35f771055ad0749c3
child 232045 8e79a95559968d8af8d0d4969ff7e5f5e34ee628
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1076129
milestone35.0a1
backs out77c1b79c5becae13b1e83b871bf3727f0cf4fced
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
Back out 77c1b79c5bec (bug 1076129) for causing frequent xpcshell crashes. Again.
netwerk/base/src/nsSocketTransport2.cpp
netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- a/netwerk/base/src/nsSocketTransport2.cpp
+++ b/netwerk/base/src/nsSocketTransport2.cpp
@@ -1234,19 +1234,17 @@ nsSocketTransport::InitiateSocket()
                 netAddrCString = NS_LITERAL_CSTRING("<IP-to-string failed>");
             SOCKET_LOG(("nsSocketTransport::InitiateSocket skipping "
                         "speculative connection for host [%s:%d] proxy "
                         "[%s:%d] with Local IP address [%s]",
                         mHost.get(), mPort, mProxyHost.get(), mProxyPort,
                         netAddrCString.get()));
         }
 #endif
-        mCondition = NS_ERROR_CONNECTION_REFUSED;
-        OnSocketDetached(nullptr);
-        return mCondition;
+        return NS_ERROR_CONNECTION_REFUSED;
     }
 
     //
     // find out if it is going to be ok to attach another socket to the STS.
     // if not then we have to wait for the STS to tell us that it is ok.
     // the notification is asynchronous, which means that when we could be
     // in a race to call AttachSocket once notified.  for this reason, when
     // we get notified, we just re-enter this function.  as a result, we are
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -1472,25 +1472,17 @@ nsHttpConnectionMgr::MakeNewConnection(n
             // We've found a speculative connection in the half
             // open list. Remove the speculative bit from it and that
             // connection can later be used for this transaction
             // (or another one in the pending queue) - we don't
             // need to open a new connection here.
             LOG(("nsHttpConnectionMgr::MakeNewConnection [ci = %s]\n"
                  "Found a speculative half open connection\n",
                  ent->mConnInfo->HashKey().get()));
-
-            uint32_t flags;
             ent->mHalfOpens[i]->SetSpeculative(false);
-            nsISocketTransport *transport = ent->mHalfOpens[i]->SocketTransport();
-            if (NS_SUCCEEDED(transport->GetConnectionFlags(&flags))) {
-                flags &= ~nsISocketTransport::DISABLE_RFC1918;
-                transport->SetConnectionFlags(flags);
-            }
-
             Telemetry::AutoCounter<Telemetry::HTTPCONNMGR_USED_SPECULATIVE_CONN> usedSpeculativeConn;
             ++usedSpeculativeConn;
 
             if (ent->mHalfOpens[i]->IsFromPredictor()) {
               Telemetry::AutoCounter<Telemetry::PREDICTOR_TOTAL_PRECONNECTS_USED> totalPreconnectsUsed;
               ++totalPreconnectsUsed;
             }