Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 970939 - Remove unwanted non-SPDY assertion from nsHttpConnection::StartShortLivedTCPKeepalives() r=mcmanus

Browse Source
This commit is contained in:
Steve Workman 2014-02-14 10:49:05 -08:00
parent 1c3895a5cf
commit 45a7b1e326
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -364,17 +364,17 @@ nsHttpConnection::Activate(nsAHttpTransaction *trans, uint32_t caps, int32_t pri
mResponseTimeoutEnabled = mTransaction->ResponseTimeout() > 0 &&
mTransaction->ResponseTimeoutEnabled();
rv = OnOutputStreamReady(mSocketOut);
if (NS_SUCCEEDED(rv)) {
nsresult rv2 = StartShortLivedTCPKeepalives();
if (NS_WARN_IF(NS_FAILED(rv2))) {
LOG(("nsHttpConnection::Activate [%p] "
"StartShortLivedTCPKeepalives failed rv2[0x%x]",
this, rv));
this, rv2));
}
}
rv = OnOutputStreamReady(mSocketOut);
failed_activation:
if (NS_FAILED(rv)) {
mTransaction = nullptr;
@ -1638,8 +1638,7 @@ nsHttpConnection::ReportDataUsage(bool allowDefer)
nsresult
nsHttpConnection::StartShortLivedTCPKeepalives()
{
MOZ_ASSERT(!mUsingSpdyVersion, "Don't use TCP Keepalive with SPDY!");
if (NS_WARN_IF(mUsingSpdyVersion)) {
if (mUsingSpdyVersion) {
return NS_OK;
}
MOZ_ASSERT(mSocketTransport);