diff options
Diffstat (limited to 'net/socket/ssl_client_socket.cc')
| -rw-r--r-- | net/socket/ssl_client_socket.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index f0161b9..8dd7a9d 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -37,9 +37,9 @@ NextProto SSLClientSocket::NextProtoFromString( } else if (proto_string == "h2-14") { // For internal consistency, HTTP/2 is named SPDY4 within Chromium. // This is the HTTP/2 draft-14 identifier. - return kProtoSPDY4_14; + return kProtoHTTP2_14; } else if (proto_string == "h2") { - return kProtoSPDY4; + return kProtoHTTP2; } else if (proto_string == "quic/1+spdy/3") { return kProtoQUIC1SPDY3; } else { @@ -58,11 +58,11 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) { return "spdy/3"; case kProtoSPDY31: return "spdy/3.1"; - case kProtoSPDY4_14: + case kProtoHTTP2_14: // For internal consistency, HTTP/2 is named SPDY4 within Chromium. // This is the HTTP/2 draft-14 identifier. return "h2-14"; - case kProtoSPDY4: + case kProtoHTTP2: return "h2"; case kProtoQUIC1SPDY3: return "quic/1+spdy/3"; @@ -201,8 +201,8 @@ std::vector<uint8_t> SSLClientSocket::SerializeNextProtos( bool can_advertise_http2) { std::vector<uint8_t> wire_protos; for (const NextProto next_proto : next_protos) { - if (!can_advertise_http2 && kProtoSPDY4MinimumVersion <= next_proto && - next_proto <= kProtoSPDY4MaximumVersion) { + if (!can_advertise_http2 && kProtoHTTP2MinimumVersion <= next_proto && + next_proto <= kProtoHTTP2MaximumVersion) { continue; } const std::string proto = NextProtoToString(next_proto); |