diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-09-15 13:56:57 +0100 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-09-18 15:26:01 -0700 |
| commit | 32a0f880868eb4d3721a4363af67287aa19e0aad (patch) | |
| tree | c3750ab1c550be546b61ff8de6e95c851d2d2bb7 | |
| parent | bf67a54e6a1e5ab331404b6e745a6c27c840d6dd (diff) | |
| download | external_webkit-32a0f880868eb4d3721a4363af67287aa19e0aad.zip external_webkit-32a0f880868eb4d3721a4363af67287aa19e0aad.tar.gz external_webkit-32a0f880868eb4d3721a4363af67287aa19e0aad.tar.bz2 | |
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: I246096834c5ca601435df0089fb7f59001506e54
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromiumInit.cpp | 3 |
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()); } |