Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Side by Side Diff: net/http/http_network_layer.cc

Issue 5592009: Disable SPDY by default as a test to see if heap corruption goes away. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change to hopefully not break tests. Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/http/http_stream_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_network_layer.h" 5 #include "net/http/http_network_layer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string_split.h" 8 #include "base/string_split.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "net/http/http_network_session.h" 10 #include "net/http/http_network_session.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 HttpAlternateProtocols::PortProtocolPair pair; 251 HttpAlternateProtocols::PortProtocolPair pair;
252 pair.port = 443; 252 pair.port = 443;
253 pair.protocol = HttpAlternateProtocols::NPN_SPDY_2; 253 pair.protocol = HttpAlternateProtocols::NPN_SPDY_2;
254 HttpAlternateProtocols::ForceAlternateProtocol(pair); 254 HttpAlternateProtocols::ForceAlternateProtocol(pair);
255 } else if (option.empty() && it == spdy_options.begin()) { 255 } else if (option.empty() && it == spdy_options.begin()) {
256 continue; 256 continue;
257 } else { 257 } else {
258 LOG(DFATAL) << "Unrecognized spdy option: " << option; 258 LOG(DFATAL) << "Unrecognized spdy option: " << option;
259 } 259 }
260 } 260 }
261
262 // TODO(willchan): Re-enable SPDY after a canary release goes out
263 // with SPDY off.
264 HttpStreamFactory::set_spdy_enabled(false);
261 } 265 }
266
262 } // namespace net 267 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_stream_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698