Commit 17c5d052 authored by Jay Satiro's avatar Jay Satiro Committed by Daniel Stenberg
Browse files

HTTPS-Proxy: don't offer h2 for https proxy connections 

Bug: https://github.com/curl/curl/issues/1254

Closes #1546
parent f94fcdba

lib/vtls/gtls.c

+2 −1
Original line number Diff line number Diff line
@@ -763,7 +763,8 @@ gtls_connect_step1(struct connectdata *conn, 
    gnutls_datum_t protocols[2];



#ifdef USE_NGHTTP2

    if(data->set.httpversion >= CURL_HTTP_VERSION_2) {

    if(data->set.httpversion >= CURL_HTTP_VERSION_2 &&

       (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) {

      protocols[cur].data = (unsigned char *)NGHTTP2_PROTO_VERSION_ID;

      protocols[cur].size = NGHTTP2_PROTO_VERSION_ID_LEN;

      cur++;

lib/vtls/nss.c

+2 −1
Original line number Diff line number Diff line
@@ -1992,7 +1992,8 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex) 
    unsigned char protocols[128];



#ifdef USE_NGHTTP2

    if(data->set.httpversion >= CURL_HTTP_VERSION_2) {

    if(data->set.httpversion >= CURL_HTTP_VERSION_2 &&

       (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) {

      protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN;

      memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID,

          NGHTTP2_PROTO_VERSION_ID_LEN);

lib/vtls/openssl.c

+2 −1
Original line number Diff line number Diff line
@@ -2057,7 +2057,8 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex) 
    unsigned char protocols[128];



#ifdef USE_NGHTTP2

    if(data->set.httpversion >= CURL_HTTP_VERSION_2) {

    if(data->set.httpversion >= CURL_HTTP_VERSION_2 &&

       (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) {

      protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN;



      memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID,