diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/http.c | 4 | ||||
| -rw-r--r-- | lib/urldata.h | 2 | ||||
| -rw-r--r-- | lib/vtls/gtls.c | 2 | ||||
| -rw-r--r-- | lib/vtls/nss.c | 2 | ||||
| -rw-r--r-- | lib/vtls/openssl.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/http.c b/lib/http.c index 4a29058c2..53e5af04f 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1674,8 +1674,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) *done = TRUE; switch (conn->negnpn) { - case NPN_HTTP2_DRAFT09: - infof(data, "http, we have to use HTTP-draft-09/2\n"); + case NPN_HTTP2: + infof(data, "Negotiated http2\n"); Curl_http2_init(conn); Curl_http2_switched(conn); break; diff --git a/lib/urldata.h b/lib/urldata.h index 25f967693..9b34645eb 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -595,7 +595,7 @@ enum upgrade101 { enum negotiatenpn { NPN_INIT, /* default state */ NPN_HTTP1_1, /* HTTP/1.1 negotiated */ - NPN_HTTP2_DRAFT09 /* HTTP-draft-0.9/2.0 negotiated */ + NPN_HTTP2 /* HTTP2 (draft-xx) negotiated */ }; /* diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 5d335e849..2a9878715 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -883,7 +883,7 @@ gtls_connect_step3(struct connectdata *conn, if(proto.size == NGHTTP2_PROTO_VERSION_ID_LEN && memcmp(NGHTTP2_PROTO_VERSION_ID, proto.data, NGHTTP2_PROTO_VERSION_ID_LEN) == 0) { - conn->negnpn = NPN_HTTP2_DRAFT09; + conn->negnpn = NPN_HTTP2; } else if(proto.size == ALPN_HTTP_1_1_LENGTH && memcmp(ALPN_HTTP_1_1, proto.data, ALPN_HTTP_1_1_LENGTH) == 0) { diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c index 80e26e2ea..577716fd5 100644 --- a/lib/vtls/nss.c +++ b/lib/vtls/nss.c @@ -657,7 +657,7 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg) if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN && memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN) == 0) { - conn->negnpn = NPN_HTTP2_DRAFT09; + conn->negnpn = NPN_HTTP2; } else if(buflen == ALPN_HTTP_1_1_LENGTH && memcmp(ALPN_HTTP_1_1, buf, ALPN_HTTP_1_1_LENGTH)) { diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 0014e588c..dc94b8982 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1431,7 +1431,7 @@ select_next_proto_cb(SSL *ssl, if(retval == 1) { infof(conn->data, "NPN, negotiated HTTP2\n"); - conn->negnpn = NPN_HTTP2_DRAFT09; + conn->negnpn = NPN_HTTP2; } else if(retval == 0) { infof(conn->data, "NPN, negotiated HTTP1.1\n"); @@ -2003,7 +2003,7 @@ ossl_connect_step2(struct connectdata *conn, int sockindex) if(len == NGHTTP2_PROTO_VERSION_ID_LEN && memcmp(NGHTTP2_PROTO_VERSION_ID, neg_protocol, len) == 0) { - conn->negnpn = NPN_HTTP2_DRAFT09; + conn->negnpn = NPN_HTTP2; } else if(len == ALPN_HTTP_1_1_LENGTH && memcmp(ALPN_HTTP_1_1, neg_protocol, ALPN_HTTP_1_1_LENGTH) == 0) { |