diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 02:18:07 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 02:18:07 +0000 |
| commit | 20eea32fad5bca888cef805230320fe4559c1c81 (patch) | |
| tree | ba4ed5fc56918bae73cbc17a5b325f9d9344ff65 | |
| parent | 5468a411b5d03bc6788aa684381f3d3cc637d076 (diff) | |
| download | chromium_src-20eea32fad5bca888cef805230320fe4559c1c81.zip chromium_src-20eea32fad5bca888cef805230320fe4559c1c81.tar.gz chromium_src-20eea32fad5bca888cef805230320fe4559c1c81.tar.bz2 | |
Disable SPDY by default as a test to see if heap corruption goes away.
Will re-enable after a canary goes out with this off.
BUG=65948
TEST=none
Review URL: http://codereview.chromium.org/5592009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68696 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/http/http_network_layer.cc | 5 | ||||
| -rw-r--r-- | net/http/http_stream_factory.cc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 3da23c2..7ce1568 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -258,5 +258,10 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) { LOG(DFATAL) << "Unrecognized spdy option: " << option; } } + + // TODO(willchan): Re-enable SPDY after a canary release goes out + // with SPDY off. + HttpStreamFactory::set_spdy_enabled(false); } + } // namespace net diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc index e30c0c5..cb1265b 100644 --- a/net/http/http_stream_factory.cc +++ b/net/http/http_stream_factory.cc @@ -165,4 +165,3 @@ void HttpStreamFactory::OnPreconnectsComplete( } } // namespace net - |