Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1394818 - TFO should be https only feature. r=mcmanus

Browse Source
This commit is contained in:
Dragana Damjanovic 2017-08-30 04:05:00 -04:00
parent dbc0762505
commit 94f37c30f0
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netwerk/base/TCPFastOpenLayer.h
View File

@ -31,7 +31,8 @@ typedef enum {
TFO_FAILED_NET_TIMEOUT__NO_TFO_FAILED_TOO,
TFO_FAILED_UNKNOW_ERROR_NO_TFO_FAILED_TOO,
TFO_FAILED_BACKUP_CONNECTION_NO_TFO_FAILED_TOO,
TFO_FAILED
TFO_FAILED,
TFO_HTTP // TFO is disabled for non-secure connections.
} TFOResult;
nsresult AttachTCPFastOpenIOLayer(PRFileDesc *fd);

3
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -126,8 +126,9 @@ nsHttpConnection::~nsHttpConnection()
}
if ((mFastOpenStatus != TFO_FAILED) &&
(mFastOpenStatus != TFO_HTTP) &&
((mFastOpenStatus != TFO_NOT_TRIED) ||
#if defined(_WIN64) && defined(WIN95)
#if defined(_WIN64) && defined(WIN95)
(gHttpHandler->UseFastOpen() &&
gSocketTransportService &&
gSocketTransportService->HasFileDesc2PlatformOverlappedIOHandleFunc()))) {

25
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -3632,12 +3632,6 @@ nsHttpConnectionMgr::GetOrCreateConnectionEntry(nsHttpConnectionInfo *specificCI
if (!specificEnt) {
RefPtr<nsHttpConnectionInfo> clone(specificCI->Clone());
specificEnt = new nsConnectionEntry(clone);
#if defined(_WIN64) && defined(WIN95)
specificEnt->mUseFastOpen = gHttpHandler->UseFastOpen() &&
gSocketTransportService->HasFileDesc2PlatformOverlappedIOHandleFunc();
#else
specificEnt->mUseFastOpen = gHttpHandler->UseFastOpen();
#endif
mCT.Put(clone->HashKey(), specificEnt);
}
return specificEnt;
@ -3771,7 +3765,6 @@ nsHalfOpenSocket::nsHalfOpenSocket(nsConnectionEntry *ent,
, mFreeToUse(true)
, mPrimaryStreamStatus(NS_OK)
, mFastOpenInProgress(false)
, mFastOpenStatus(TFO_NOT_TRIED)
, mEnt(ent)
{
MOZ_ASSERT(ent && trans, "constructor with null arguments");
@ -3788,6 +3781,11 @@ nsHalfOpenSocket::nsHalfOpenSocket(nsConnectionEntry *ent,
}
}
if (mEnt->mConnInfo->FirstHopSSL()) {
mFastOpenStatus = TFO_NOT_TRIED;
} else {
mFastOpenStatus = TFO_HTTP;
}
MOZ_ASSERT(mEnt);
}
@ -4960,7 +4958,18 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci)
, mDoNotDestroy(false)
{
MOZ_COUNT_CTOR(nsConnectionEntry);
mUseFastOpen = gHttpHandler->UseFastOpen();
if (mConnInfo->FirstHopSSL()) {
#if defined(_WIN64) && defined(WIN95)
mUseFastOpen = gHttpHandler->UseFastOpen() &&
gSocketTransportService->HasFileDesc2PlatformOverlappedIOHandleFunc();
#else
mUseFastOpen = gHttpHandler->UseFastOpen();
#endif
} else {
// Only allow the TCP fast open on a secure connection.
mUseFastOpen = false;
}
LOG(("nsConnectionEntry::nsConnectionEntry this=%p key=%s",
this, ci->HashKey().get()));