diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 18:42:12 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 18:42:12 +0000 |
| commit | 39c48fcca9e6dfcd163778ed17d3eff865cf204b (patch) | |
| tree | eb28e6daabb23f5d290466102dc729da83708271 /net/http/http_server_properties.cc | |
| parent | a1b9abbd91e5cfa56fb2649ce86709fac623f4ed (diff) | |
| download | chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.zip chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.tar.gz chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.tar.bz2 | |
SPDY - integration of spdy/3 code.
TEST=network unit tests and browser unit_tests
R=willchan
Review URL: https://chromiumcodereview.appspot.com/9618002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_server_properties.cc')
| -rw-r--r-- | net/http/http_server_properties.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc index b685900..5dfcebc 100644 --- a/net/http/http_server_properties.cc +++ b/net/http/http_server_properties.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,6 +14,7 @@ const char* const kAlternateProtocolStrings[] = { "npn-spdy/1", "npn-spdy/2", "npn-spdy/2.1", + "npn-spdy/3", }; static const char* AlternateProtocolToString(AlternateProtocol protocol) { @@ -21,6 +22,7 @@ static const char* AlternateProtocolToString(AlternateProtocol protocol) { case NPN_SPDY_1: case NPN_SPDY_2: case NPN_SPDY_21: + case NPN_SPDY_3: return kAlternateProtocolStrings[protocol]; case ALTERNATE_PROTOCOL_BROKEN: return "Broken"; |