diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-02-11 16:30:32 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-02-12 08:13:37 +0100 |
| commit | 88dd1a8a115b1f5ece26fd8941b4464973b7d913 (patch) | |
| tree | 2dff281d92e8795a15520ef3568fb55ec7a32fbc /lib/vtls/openssl.c | |
| parent | bd6b54ba1f55b579b7fc90de271bb1992a8fb975 (diff) | |
| download | curl-88dd1a8a115b1f5ece26fd8941b4464973b7d913.tar.gz | |
urldata: don't touch data->set.httpversion at run-time
Rename it to 'httpwant' and make a cloned field in the state struct as
well for run-time updates.
Also: refuse non-supported HTTP versions. Verified with test 129.
Closes #6585
Diffstat (limited to 'lib/vtls/openssl.c')
| -rw-r--r-- | lib/vtls/openssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index c4621d8d3..ed374dc32 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -2222,7 +2222,7 @@ select_next_proto_cb(SSL *ssl, (void)ssl; #ifdef USE_NGHTTP2 - if(data->set.httpversion >= CURL_HTTP_VERSION_2 && + if(data->state.httpwant >= CURL_HTTP_VERSION_2 && !select_next_protocol(out, outlen, in, inlen, NGHTTP2_PROTO_VERSION_ID, NGHTTP2_PROTO_VERSION_ID_LEN)) { infof(data, "NPN, negotiated HTTP2 (%s)\n", @@ -2749,7 +2749,7 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, unsigned char protocols[128]; #ifdef USE_NGHTTP2 - if(data->set.httpversion >= CURL_HTTP_VERSION_2 + if(data->state.httpwant >= CURL_HTTP_VERSION_2 #ifndef CURL_DISABLE_PROXY && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) #endif |