diff options
author | dartraiden <wowemuh@gmail.com> | 2020-08-20 16:00:06 +0300 |
---|---|---|
committer | dartraiden <wowemuh@gmail.com> | 2020-08-20 16:00:06 +0300 |
commit | e5193f7cfc63bed18795b195a1b86a959638a5bf (patch) | |
tree | 556aaab722ebcdbd63c89d2ccabca5144c1537e2 /libs/libcurl/src/vtls/bearssl.c | |
parent | fb9c38570dbdb83d3c53b01f12326a97f7ba16e3 (diff) |
libcurl: update to 7.72.0
Diffstat (limited to 'libs/libcurl/src/vtls/bearssl.c')
-rw-r--r-- | libs/libcurl/src/vtls/bearssl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libs/libcurl/src/vtls/bearssl.c b/libs/libcurl/src/vtls/bearssl.c index 628e16a124..44e7406e8e 100644 --- a/libs/libcurl/src/vtls/bearssl.c +++ b/libs/libcurl/src/vtls/bearssl.c @@ -300,8 +300,12 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_backend_data *backend = connssl->backend; const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); +#ifndef CURL_DISABLE_PROXY const char *hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : conn->host.name; +#else + const char *hostname = conn->host.name; +#endif const bool verifypeer = SSL_CONN_CONFIG(verifypeer); const bool verifyhost = SSL_CONN_CONFIG(verifyhost); CURLcode ret; @@ -386,8 +390,11 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex) */ #ifdef USE_NGHTTP2 - if(data->set.httpversion >= CURL_HTTP_VERSION_2 && - (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) { + if(data->set.httpversion >= CURL_HTTP_VERSION_2 +#ifndef CURL_DISABLE_PROXY + && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) +#endif + ) { backend->protocols[cur++] = NGHTTP2_PROTO_VERSION_ID; infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID); } |