nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset 25b411a687da (bug 1377004) for quantum_pageload_google failures on win10 a=backout

Browse source 
MozReview-Commit-ID: IYlC0BWMxC7

--HG--
extra : source : 44502217ccf7cd6e6de02a47a084cbc2e33a2b01
This commit is contained in:
Wes Kocher 2017-07-03 11:05:59 -07:00
parent 50ae69bb30
commit a016e6e84a
3 changed files with 11 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
modules/libpref/init/all.js
View file

@ -4699,7 +4699,7 @@ pref("network.tcp.keepalive.retry_interval", 1); // seconds
pref("network.tcp.keepalive.probe_count", 4); pref("network.tcp.keepalive.probe_count", 4);
#endif #endif
pref("network.tcp.tcp_fastopen_enable", true); pref("network.tcp.tcp_fastopen_enable", false);
pref("network.tcp.tcp_fastopen_consecutive_failure_limit", 5); pref("network.tcp.tcp_fastopen_consecutive_failure_limit", 5);
// Whether to disable acceleration for all widgets. // Whether to disable acceleration for all widgets.

4
netwerk/base/TCPFastOpenLayer.cpp
View file

@ -400,8 +400,8 @@ TCPFastOpenFinish(PRFileDesc *fd, PRErrorCode &err,
// We have some data ready in the buffer we will send it with the syn // We have some data ready in the buffer we will send it with the syn
// packet. // packet.
PRInt32 rv = (tfoFd->lower->methods->sendto)(tfoFd->lower, PRInt32 rv = (tfoFd->lower->methods->sendto)(tfoFd->lower,
nullptr, secret->mFirstPacketBuf,
0, secret->mFirstPacketBufLen,
0, //flags 0, //flags
&secret->mAddr, &secret->mAddr,
PR_INTERVAL_NO_WAIT); PR_INTERVAL_NO_WAIT);

11
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View file

@ -4164,9 +4164,7 @@ nsHalfOpenSocket::StartFastOpen()
SetupBackupTimer(); SetupBackupTimer();
} }
} }
if (mEnt) {
mEnt->mDoNotDestroy = false; mEnt->mDoNotDestroy = false;
}
return rv; return rv;
} }
@ -4261,14 +4259,17 @@ nsHalfOpenSocket::SetFastOpenConnected(nsresult aError, bool aWillRetry)
mStreamOut = nullptr; mStreamOut = nullptr;
mStreamIn = nullptr; mStreamIn = nullptr;
Abandon(); // If backup transport ha already started put this HalfOpen back to
// mEnt list.
if (mBackupTransport) {
mEnt->mHalfOpens.AppendElement(this);
gHttpHandler->ConnMgr()->mNumHalfOpenConns++;
}
} }
mFastOpenInProgress = false; mFastOpenInProgress = false;
mConnectionNegotiatingFastOpen = nullptr; mConnectionNegotiatingFastOpen = nullptr;
if (mEnt) {
mEnt->mDoNotDestroy = false; mEnt->mDoNotDestroy = false;
}
} }
void void