summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-09-15 13:56:57 +0100
committerBen Murdoch <benm@google.com>2011-09-19 17:59:47 +0100
commite780b15a77775b6c1931641022c17a1664f08332 (patch)
tree16b3bda8fa51affa2099fda74b9b6b4cc899011d /Source/WebKit
parentb89ca42de63bd33d6fef6bc3a6d321f41f220086 (diff)
downloadexternal_webkit-e780b15a77775b6c1931641022c17a1664f08332.zip
external_webkit-e780b15a77775b6c1931641022c17a1664f08332.tar.gz
external_webkit-e780b15a77775b6c1931641022c17a1664f08332.tar.bz2
Reapply: Fix for bug 5226268 [Browser] http keep-alive packets DO NOT MERGE
Disabling SPDY as part of not reusing connections Also needs the following CL in external/chromium: https://android-git.corp.google.com/g/#/c/135472/ Change-Id: If69a5c4ba3965c0465808b13a51f9221fdf4e639
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
index 500975c..f5029d5 100644
--- a/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
+++ b/Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp
@@ -68,7 +68,8 @@ void initChromium()
if (!initCalled) {
logging::SetLogMessageHandler(logMessageHandler);
networkChangeNotifier.reset(net::NetworkChangeNotifier::Create());
- net::HttpNetworkLayer::EnableSpdy("npn");
+ // Disable SPDY for bug 5226268 [Browser] http keep-alive packets are sent too frequently to network
+ // net::HttpNetworkLayer::EnableSpdy("npn");
initCalled = true;
jni::SetJavaVM(JSC::Bindings::getJavaVM());
}