wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 77c1b79c5bec (bug 1076129) for causing frequent xpcshell crashes. Again.

Browse Source
This commit is contained in:
Phil Ringnalda 2014-10-04 13:58:25 -07:00
parent 610ab2c7e5
commit d77468da44
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netwerk/base/src/nsSocketTransport2.cpp
View File

@ -1239,9 +1239,7 @@ nsSocketTransport::InitiateSocket()
netAddrCString.get())); netAddrCString.get()));
} }
#endif #endif
mCondition = NS_ERROR_CONNECTION_REFUSED; return NS_ERROR_CONNECTION_REFUSED;
OnSocketDetached(nullptr);
return mCondition;
} }
// //

8
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -1477,15 +1477,7 @@ nsHttpConnectionMgr::MakeNewConnection(nsConnectionEntry *ent,
LOG(("nsHttpConnectionMgr::MakeNewConnection [ci = %s]\n" LOG(("nsHttpConnectionMgr::MakeNewConnection [ci = %s]\n"
"Found a speculative half open connection\n", "Found a speculative half open connection\n",
ent->mConnInfo->HashKey().get())); ent->mConnInfo->HashKey().get()));
uint32_t flags;
ent->mHalfOpens[i]->SetSpeculative(false); 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; Telemetry::AutoCounter<Telemetry::HTTPCONNMGR_USED_SPECULATIVE_CONN> usedSpeculativeConn;
++usedSpeculativeConn; ++usedSpeculativeConn;