diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-03-31 08:40:24 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-03-31 08:40:24 +0200 |
| commit | ef813c709749d02d8dee17f5215239909b2fe968 (patch) | |
| tree | 373ebf9c3065bb666f0fe0512112e0e8d1039559 /lib/vtls | |
| parent | 9317eced98408c7fefa6dd5f1559050e1ec8a3b7 (diff) | |
http2: remove _DRAFT09 from the NPN_HTTP2 enum
We're progressing throught drafts so there's no point in having a fixed
one in a symbol that'll survive.
Diffstat (limited to 'lib/vtls')
| -rw-r--r-- | lib/vtls/gtls.c | 2 | ||||
| -rw-r--r-- | lib/vtls/nss.c | 2 | ||||
| -rw-r--r-- | lib/vtls/openssl.c | 4 |
3 files changed, 4 insertions, 4 deletions
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) { |