diff options
| -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/ssl_client_socket.cc | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc index 5e0229fb..e2da1e7 100644 --- a/net/http/http_response_info.cc +++ b/net/http/http_response_info.cc @@ -394,9 +394,9 @@ std::string HttpResponseInfo::ConnectionInfoToString( case CONNECTION_INFO_SPDY3: return "spdy/3"; case CONNECTION_INFO_SPDY4: - // This is the HTTP/2 draft 11 identifier. For internal + // This is the HTTP/2 draft 12 identifier. For internal // consistency, HTTP/2 is named SPDY4 within Chromium. - return "h2-11"; + return "h2-12"; 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 5f2bf092..72b47c1 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-11", // HTTP/2 draft 11. Called SPDY4 internally. + "npn-h2-12", // HTTP/2 draft 12. Called SPDY4 internally. "quic" }; const char kBrokenAlternateProtocol[] = "Broken"; diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index 588ded4..1b2fe14 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -32,8 +32,8 @@ NextProto SSLClientSocket::NextProtoFromString( return kProtoSPDY3; } else if (proto_string == "spdy/3.1") { return kProtoSPDY31; - } else if (proto_string == "h2-11") { - // This is the HTTP/2 draft 11 identifier. For internal + } else if (proto_string == "h2-12") { + // This is the HTTP/2 draft 12 identifier. For internal // consistency, HTTP/2 is named SPDY4 within Chromium. return kProtoSPDY4; } else if (proto_string == "quic/1+spdy/3") { @@ -55,9 +55,9 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) { case kProtoSPDY31: return "spdy/3.1"; case kProtoSPDY4: - // This is the HTTP/2 draft 11 identifier. For internal + // This is the HTTP/2 draft 12 identifier. For internal // consistency, HTTP/2 is named SPDY4 within Chromium. - return "h2-11"; + return "h2-12"; case kProtoQUIC1SPDY3: return "quic/1+spdy/3"; case kProtoUnknown: |