network_fix draft
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 01 Feb 2018 12:17:34 +0100
changeset 750093 2ee3ae443e4ef944be45b034c11ab2ca5bfa4829
parent 749896 17ade9f88b6ed2232be51bc02c6860562c3d31dc
child 750094 7fdb0733eee96523cc3d846c9429c39de4117ed0
push id97545
push usermak77@bonardo.net
push dateThu, 01 Feb 2018 14:57:12 +0000
milestone60.0a1
network_fix MozReview-Commit-ID: Kajhw2TWBDk
netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -4586,20 +4586,21 @@ nsHalfOpenSocket::SetFastOpenConnected(n
     // in case nsHttpConnection::Activate fails will be done in StartFastOpen.
     // Also OnMsgReclaimConnection can decided that we do not need this
     // transaction and cancel it as well.
     // In all other cases mConnectionNegotiatingFastOpen must not be nullptr.
     if (!mConnectionNegotiatingFastOpen) {
         return;
     }
 
-    MOZ_ASSERT((mFastOpenStatus == TFO_NOT_TRIED) || 
+    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);