From ef300e6ca6e80a7171e84be3cf5c3bbb31025220 Mon Sep 17 00:00:00 2001 From: Dragana Damjanovic Date: Wed, 20 Dec 2017 08:39:00 +0200 Subject: [PATCH] Bug 1426408 - Remove some code for the TCP fast open for Windows 10 that is not neede any more. r=mayhemer --HG-- extra : rebase_source : 8ab4fbe254eaaca0595cfbcd6ba527810ecc5102 --- netwerk/base/TCPFastOpenLayer.cpp | 3 +-- netwerk/protocol/http/nsHttpHandler.h | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/netwerk/base/TCPFastOpenLayer.cpp b/netwerk/base/TCPFastOpenLayer.cpp index c412aa4909f3..6cedc0ddd279 100644 --- a/netwerk/base/TCPFastOpenLayer.cpp +++ b/netwerk/base/TCPFastOpenLayer.cpp @@ -421,8 +421,7 @@ TCPFastOpenFinish(PRFileDesc *fd, PRErrorCode &err, result = PR_GetError(); SOCKET_LOG(("TCPFastOpenFinish - sendto error=%d.\n", result)); - if (result == PR_NOT_IMPLEMENTED_ERROR || // When a windows version does not support Fast Open it will return this error. - result == PR_NOT_TCP_SOCKET_ERROR) { // SendTo will return PR_NOT_TCP_SOCKET_ERROR if TCP Fast Open is turned off on Linux. + if (result == PR_NOT_TCP_SOCKET_ERROR) { // SendTo will return PR_NOT_TCP_SOCKET_ERROR if TCP Fast Open is turned off on Linux. // We can call connect again. fastOpenNotSupported = true; rv = (tfoFd->lower->methods->connect)(tfoFd->lower, &secret->mAddr, diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h index 55853ee3c32c..852caeab6061 100644 --- a/netwerk/protocol/http/nsHttpHandler.h +++ b/netwerk/protocol/http/nsHttpHandler.h @@ -184,10 +184,6 @@ public: // If one of tcp connections return PR_NOT_TCP_SOCKET_ERROR while trying // fast open, it means that Fast Open is turned off so we will not try again // until a restart. This is only on Linux. - // For windows 10 we can only check whether a version of windows support - // Fast Open at run time, so if we get error PR_NOT_IMPLEMENTED_ERROR it - // means that Fast Open is not supported and we will set mFastOpenSupported - // to false. void SetFastOpenNotSupported() { mFastOpenSupported = false; } void IncrementFastOpenConsecutiveFailureCounter();