summaryrefslogtreecommitdiffstats
path: root/net/http/http_server_properties.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 20:42:36 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 20:42:36 +0000
commitd5b42bdd76ee895b0b4f6895400ba23c60decc96 (patch)
treec22819d9514580389d15ed82e4a79b806ebfefd2 /net/http/http_server_properties.cc
parent84981baa4338eec37363ad541054df96b3ad456a (diff)
downloadchromium_src-d5b42bdd76ee895b0b4f6895400ba23c60decc96.zip
chromium_src-d5b42bdd76ee895b0b4f6895400ba23c60decc96.tar.gz
chromium_src-d5b42bdd76ee895b0b4f6895400ba23c60decc96.tar.bz2
[SPDY] Incorporate latest framing changes from HTTP2 into SPDY 4 as SPDY 4a2.
Removes support for SPDY 4a1. Remove --enable-spdy4 flag for now (until we get test coverage). This lands server change 45362310. BUG=230124 TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/14189003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_server_properties.cc')
-rw-r--r--net/http/http_server_properties.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index 48b21ac..81a0e98 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc
@@ -17,7 +17,7 @@ const char* const kAlternateProtocolStrings[] = {
"npn-spdy/2",
"npn-spdy/3",
"npn-spdy/3.1",
- "npn-spdy/4a1",
+ "npn-spdy/4a2",
"quic"
};
const char kBrokenAlternateProtocol[] = "Broken";