diff options
| author | Bence Béky <bnc@chromium.org> | 2014-11-17 14:53:53 -0500 |
|---|---|---|
| committer | Bence Béky <bnc@chromium.org> | 2014-11-17 19:56:09 +0000 |
| commit | daede7023bea93669096be285c477cc1c513916d (patch) | |
| tree | 47205505cda142c027c76f6660cb9ce5e3fe5f14 | |
| parent | 4b4bd859cbb841e2b3e731cb73d5689094907291 (diff) | |
| download | chromium_src-daede7023bea93669096be285c477cc1c513916d.zip chromium_src-daede7023bea93669096be285c477cc1c513916d.tar.gz chromium_src-daede7023bea93669096be285c477cc1c513916d.tar.bz2 | |
Revert "Update ALPN/NPN token from "h2-14" to "h2-15"."
This reverts commit 6371af94b25f78f85691e892627a9e88832e2ba0.
Justification:
1. h2-15 is not an implementation draft, most servers out in the wild still
advertise h2-14 and will presumably do so until h2 is finalized.
2. h2-15 has HTTP_1_1_REQUIRED error code which is not implemented yet.
BUG=345769
R=rch@chromium.org
Review URL: https://codereview.chromium.org/733183002
Cr-Commit-Position: refs/branch-heads/2214@{#66}
Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
| -rw-r--r-- | net/http/http_response_info.cc | 4 | ||||
| -rw-r--r-- | net/http/http_server_properties.cc | 2 | ||||
| -rw-r--r-- | net/socket/next_proto.h | 3 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket.cc | 8 |
4 files changed, 8 insertions, 9 deletions
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc index 2ec0fb5..9569b38 100644 --- a/net/http/http_response_info.cc +++ b/net/http/http_response_info.cc @@ -396,9 +396,9 @@ std::string HttpResponseInfo::ConnectionInfoToString( case CONNECTION_INFO_SPDY3: return "spdy/3"; case CONNECTION_INFO_SPDY4: - // This is the HTTP/2 draft-15 identifier. For internal + // This is the HTTP/2 draft 14 identifier. For internal // consistency, HTTP/2 is named SPDY4 within Chromium. - return "h2-15"; + return "h2-14"; case CONNECTION_INFO_QUIC1_SPDY3: return "quic/1+spdy/3"; case NUM_OF_CONNECTION_INFOS: diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc index cc41ea8..4433b4e 100644 --- a/net/http/http_server_properties.cc +++ b/net/http/http_server_properties.cc @@ -20,7 +20,7 @@ const char* const kAlternateProtocolStrings[] = { "npn-spdy/2", "npn-spdy/3", "npn-spdy/3.1", - "npn-h2-15", // HTTP/2 draft-15. Called SPDY4 internally. + "npn-h2-14", // HTTP/2 draft 14. Called SPDY4 internally. "quic" }; diff --git a/net/socket/next_proto.h b/net/socket/next_proto.h index 89400a9..4df6e9b 100644 --- a/net/socket/next_proto.h +++ b/net/socket/next_proto.h @@ -27,8 +27,7 @@ enum NextProto { kProtoSPDYMinimumVersion = kProtoDeprecatedSPDY2, kProtoSPDY3 = 101, kProtoSPDY31 = 102, - // HTTP/2 draft-14 was 103, - kProtoSPDY4 = 104, // SPDY4 is HTTP/2 draft-15. + kProtoSPDY4 = 103, // SPDY4 is HTTP/2. kProtoSPDYMaximumVersion = kProtoSPDY4, kProtoQUIC1SPDY3 = 200, diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index 269ca7e..3184e04 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -37,8 +37,8 @@ NextProto SSLClientSocket::NextProtoFromString( return kProtoSPDY3; } else if (proto_string == "spdy/3.1") { return kProtoSPDY31; - } else if (proto_string == "h2-15") { - // This is the HTTP/2 draft-15 identifier. For internal + } else if (proto_string == "h2-14") { + // This is the HTTP/2 draft 14 identifier. For internal // consistency, HTTP/2 is named SPDY4 within Chromium. return kProtoSPDY4; } else if (proto_string == "quic/1+spdy/3") { @@ -60,9 +60,9 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) { case kProtoSPDY31: return "spdy/3.1"; case kProtoSPDY4: - // This is the HTTP/2 draft-15 identifier. For internal + // This is the HTTP/2 draft 14 identifier. For internal // consistency, HTTP/2 is named SPDY4 within Chromium. - return "h2-15"; + return "h2-14"; case kProtoQUIC1SPDY3: return "quic/1+spdy/3"; case kProtoUnknown: |