diff options
| author | Ben Murdoch <benm@google.com> | 2011-09-20 10:30:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-20 10:30:12 -0700 |
| commit | 29fbad9ecd8063d5ff93a152cde062582648aa32 (patch) | |
| tree | fc342b7bafc40c0557ea2b0f6749a0ac564bda26 /Source/WebKit | |
| parent | a2ddd21f070651d1e10ef703c7841525ef556edc (diff) | |
| parent | e780b15a77775b6c1931641022c17a1664f08332 (diff) | |
| download | external_webkit-29fbad9ecd8063d5ff93a152cde062582648aa32.zip external_webkit-29fbad9ecd8063d5ff93a152cde062582648aa32.tar.gz external_webkit-29fbad9ecd8063d5ff93a152cde062582648aa32.tar.bz2 | |
Merge "Reapply: Fix for bug 5226268 [Browser] http keep-alive packets DO NOT MERGE"
Diffstat (limited to 'Source/WebKit')
| -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()); } |