summaryrefslogtreecommitdiffstats
path: root/net/http/http_stream_factory.cc
diff options
context:
space:
mode:
authorrtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 22:52:11 +0000
committerrtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 22:52:11 +0000
commit7ce4571ef61711d3bc926504f9fe195147ea1406 (patch)
tree938ffe6bbad099ae5d71f59ddbd079d021312299 /net/http/http_stream_factory.cc
parentb63dce538ea19d1f4c277d80395d47d1f47fec75 (diff)
downloadchromium_src-7ce4571ef61711d3bc926504f9fe195147ea1406.zip
chromium_src-7ce4571ef61711d3bc926504f9fe195147ea1406.tar.gz
chromium_src-7ce4571ef61711d3bc926504f9fe195147ea1406.tar.bz2
SPDY - Alternate-Protocol to be enabled when SPDY/3 protocol is negotiated.
Made this small change (set use_alternate_protocols_ to true for SPDY/3) so that we can merge into other branches. BUG=143963 R=willchan TEST=network unit tests Review URL: https://chromiumcodereview.appspot.com/10877003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory.cc')
-rw-r--r--net/http/http_stream_factory.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index 2d87bc7..ca3b294 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -170,6 +170,7 @@ void HttpStreamFactory::EnableNpnHttpOnly() {
// static
void HttpStreamFactory::EnableNpnSpdy3() {
+ set_use_alternate_protocols(true);
std::vector<std::string> next_protos;
next_protos.push_back("http/1.1");
next_protos.push_back("spdy/2");