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

MozReview-Commit-ID: IYlC0BWMxC7

modules/libpref/init/all.js

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

netwerk/base/TCPFastOpenLayer.cpp

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

netwerk/protocol/http/nsHttpConnectionMgr.cpp

@@ -4164,9 +4164,7 @@ nsHalfOpenSocket::StartFastOpen()
             SetupBackupTimer();
         }
     }
-    if (mEnt) {
-        mEnt->mDoNotDestroy = false;
-    }
+    mEnt->mDoNotDestroy = false;
     return rv;
 }
 
@@ -4261,14 +4259,17 @@ nsHalfOpenSocket::SetFastOpenConnected(nsresult aError, bool aWillRetry)
         mStreamOut = 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;
     mConnectionNegotiatingFastOpen = nullptr;
-    if (mEnt) {
-        mEnt->mDoNotDestroy = false;
-    }
+    mEnt->mDoNotDestroy = false;
 }
 
 void