diff options
| author | Jacob Hoffman-Andrews <github@hoffman-andrews.com> | 2021-04-24 18:05:15 -0700 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-04-29 15:04:39 +0200 |
| commit | a3268eca792f1c2ff8754de3c4094ee9762b2a87 (patch) | |
| tree | 1db9cdc06ab5b21e6374eb50a36545338eb22352 /lib/vtls/schannel.c | |
| parent | 5c932f8fe9dad94a7417702958ffa9e8db67c549 (diff) | |
| download | curl-a3268eca792f1c2ff8754de3c4094ee9762b2a87.tar.gz | |
tls: add USE_HTTP2 define
This abstracts across the two HTTP/2 backends: nghttp2 and Hyper.
Add our own define for the "h2" ALPN protocol, so TLS backends can use
it without depending on a specific HTTP backend.
Closes #6959
Diffstat (limited to 'lib/vtls/schannel.c')
| -rw-r--r-- | lib/vtls/schannel.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 9efbcc297..4ddab55d2 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -877,11 +877,11 @@ schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn, list_start_index = cur; -#ifdef USE_NGHTTP2 +#ifdef USE_HTTP2 if(data->state.httpwant >= CURL_HTTP_VERSION_2) { - memcpy(&alpn_buffer[cur], NGHTTP2_PROTO_ALPN, NGHTTP2_PROTO_ALPN_LEN); - cur += NGHTTP2_PROTO_ALPN_LEN; - infof(data, "schannel: ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID); + memcpy(&alpn_buffer[cur], ALPN_H2, ALPN_H2_LENGTH); + cur += ALPN_H2_LENGTH; + infof(data, "schannel: ALPN, offering %s\n", ALPN_H2); } #endif @@ -1392,10 +1392,9 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, infof(data, "schannel: ALPN, server accepted to use %.*s\n", alpn_result.ProtocolIdSize, alpn_result.ProtocolId); -#ifdef USE_NGHTTP2 - if(alpn_result.ProtocolIdSize == NGHTTP2_PROTO_VERSION_ID_LEN && - !memcmp(NGHTTP2_PROTO_VERSION_ID, alpn_result.ProtocolId, - NGHTTP2_PROTO_VERSION_ID_LEN)) { +#ifdef USE_HTTP2 + if(alpn_result.ProtocolIdSize == ALPN_H2_LENGTH && + !memcmp(ALPN_H2, alpn_result.ProtocolId, ALPN_H2_LENGTH)) { conn->negnpn = CURL_HTTP_VERSION_2; } else |