summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 22:10:35 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 22:10:35 +0000
commitd45c189b98e9f6fea5547e20c6e5668404de3dab (patch)
tree5a2d4a66717c6c3eba6d2e970adae253f0bc501c
parent1a522567a7cf1eb82939b495c26bb190f289705d (diff)
downloadchromium_src-d45c189b98e9f6fea5547e20c6e5668404de3dab.zip
chromium_src-d45c189b98e9f6fea5547e20c6e5668404de3dab.tar.gz
chromium_src-d45c189b98e9f6fea5547e20c6e5668404de3dab.tar.bz2
SPDY: Don't embed a NUL in SetNextProtos(). This makes NPN work again.
Review URL: http://codereview.chromium.org/1762003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45249 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/http/http_network_layer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 4e53abe..294e54e 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -147,7 +147,7 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) {
// it presumedly has a better understanding of which protocol we should
// use, therefore the rest of the ordering here is not important.
HttpNetworkTransaction::SetNextProtos(
- "\008http/1.1\007http1.1\006spdy/1\004spdy");
+ "\x08http/1.1\x07http1.1\x06spdy/1\x04spdy");
force_spdy_ = false;
} else if (option.empty() && it == spdy_options.begin()) {
continue;