From f0b4db1ab0f803fdad576d77220434d04651db76 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 26 Jun 2017 18:05:38 +0200 Subject: vtls: move the SUPPORT_HTTPS_PROXY flag into the Curl_ssl struct That will allow us to choose the SSL backend at runtime. Signed-off-by: Johannes Schindelin --- lib/vtls/vtls.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/vtls/vtls.c') diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c index 86bb46c2a..d55328b8c 100644 --- a/lib/vtls/vtls.c +++ b/lib/vtls/vtls.c @@ -205,12 +205,10 @@ ssl_connect_init_proxy(struct connectdata *conn, int sockindex) DEBUGASSERT(conn->bits.proxy_ssl_connected[sockindex]); if(ssl_connection_complete == conn->ssl[sockindex].state && !conn->proxy_ssl[sockindex].use) { -#if defined(HTTPS_PROXY_SUPPORT) + if(!Curl_ssl->support_https_proxy) + return CURLE_NOT_BUILT_IN; conn->proxy_ssl[sockindex] = conn->ssl[sockindex]; memset(&conn->ssl[sockindex], 0, sizeof(conn->ssl[sockindex])); -#else - return CURLE_NOT_BUILT_IN; -#endif } return CURLE_OK; } -- cgit v1.2.3