Bug 1434609 - Add TFO_DISABLED as one of possible states after finishing TCP Fast Open (TFO) connection, r=valentin
authorHonza Bambas <honzab.moz@firemni.cz>
Tue, 20 Feb 2018 05:41:00 +0200
changeset 404532 760d011572dfca2ea39efafbced6518be22c513c
parent 404531 e09d310a14b269778f40c1cc563db28ed93c68f2
child 404533 91b807639ce3ab9b02a3d5f11b9dfaea497d526a
push id100029
push usernbeleuzu@mozilla.com
push dateTue, 20 Feb 2018 20:13:22 +0000
treeherdermozilla-inbound@2e14ee07de8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin
bugs1434609
milestone60.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
Bug 1434609 - Add TFO_DISABLED as one of possible states after finishing TCP Fast Open (TFO) connection, r=valentin
netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -4589,17 +4589,18 @@ nsHalfOpenSocket::SetFastOpenConnected(n
     // In all other cases mConnectionNegotiatingFastOpen must not be nullptr.
     if (!mConnectionNegotiatingFastOpen) {
         return;
     }
 
     MOZ_ASSERT((mFastOpenStatus == TFO_NOT_TRIED) || 
                (mFastOpenStatus == TFO_DATA_SENT) ||
                (mFastOpenStatus == TFO_TRIED) ||
-               (mFastOpenStatus == TFO_DATA_COOKIE_NOT_ACCEPTED));
+               (mFastOpenStatus == TFO_DATA_COOKIE_NOT_ACCEPTED) ||
+               (mFastOpenStatus == TFO_DISABLED));
 
     RefPtr<nsHalfOpenSocket> deleteProtector(this);
 
     mEnt->mDoNotDestroy = true;
 
     // Delete 2 points of entry to FastOpen function so that we do not reenter.
     mEnt->mHalfOpenFastOpenBackups.RemoveElement(this);
     mSocketTransport->SetFastOpenCallback(nullptr);