summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 21:15:13 +0000
committerlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 21:15:13 +0000
commit789d04a3d1721efa2f78389e4441d365bda7ddab (patch)
tree2ef54d031a7f1efb977cc2b1730c5668156bfc63 /net
parentf4a57a33aaf2ac9d00ac8ffa014e3278fb528318 (diff)
downloadchromium_src-789d04a3d1721efa2f78389e4441d365bda7ddab.zip
chromium_src-789d04a3d1721efa2f78389e4441d365bda7ddab.tar.gz
chromium_src-789d04a3d1721efa2f78389e4441d365bda7ddab.tar.bz2
Increase npn_spdy to 50%, npn_http 25%.
Disable alternate protocol for npn_http case so browser don't need to fallback to http (extra overhead) in this case. Keep default group at 25% so we could use it to compare performance against alternate protocol with spdy case. BUG=48967 TEST=none Review URL: http://codereview.chromium.org/2904012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_network_layer.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 09ba494..7df286f 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -171,7 +171,9 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) {
HttpNetworkTransaction::SetNextProtos(kNpnProtosFull);
force_spdy_ = false;
} else if (option == kEnableNpnHttpOnly) {
- HttpNetworkTransaction::SetUseAlternateProtocols(use_alt_protocols);
+ // Avoid alternate protocol in this case. Otherwise, browser will try SSL
+ // and then fallback to http. This introduces extra load.
+ HttpNetworkTransaction::SetUseAlternateProtocols(false);
HttpNetworkTransaction::SetNextProtos(kNpnProtosHttpOnly);
force_spdy_ = false;
} else if (option == kDisableAltProtocols) {