author | Dragana Damjanovic dd.mozilla@gmail.com |
Thu, 11 Jan 2018 15:10:12 +0100 | |
changeset 450611 | e5fb2e369165426e1109bada6667539cae10b4a6 |
parent 450610 | b5790cb796709cf48eb7ab8a4ba71dd1159f4351 |
child 450612 | 6159c8eb544245f0a3ed8766608202ee72530101 |
push id | 8528 |
push user | ryanvm@gmail.com |
push date | Fri, 12 Jan 2018 02:17:15 +0000 |
treeherder | mozilla-beta@713625f4b2f8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | valentin |
bugs | 1429426 |
milestone | 59.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
|
--- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -313,16 +313,23 @@ nsHttpHandler::nsHttpHandler() void nsHttpHandler::SetFastOpenOSSupport() { mFastOpenSupported = false; #if !defined(XP_WIN) && !defined(XP_LINUX) && !defined(ANDROID) && !defined(HAS_CONNECTX) return; #elif defined(XP_WIN) mFastOpenSupported = IsWindows10BuildOrLater(16299); + + if (mFastOpenSupported) { + // We have some problems with lavasoft software and tcp fast open. + if (GetModuleHandleW(L"pmls64.dll") || GetModuleHandleW(L"rlls64.dll")) { + mFastOpenSupported = false; + } + } #else nsAutoCString version; nsresult rv; #ifdef ANDROID nsCOMPtr<nsIPropertyBag2> infoService = do_GetService("@mozilla.org/system-info;1"); MOZ_ASSERT(infoService, "Could not find a system info service");