diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-06-26 18:05:38 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-08-28 14:56:56 +0200 |
| commit | f0b4db1ab0f803fdad576d77220434d04651db76 (patch) | |
| tree | 0a7aaa97f79e184999d8bd7e8eb28e7fe4b3ad64 /lib/vtls/vtls.c | |
| parent | 937899a3b8e1124df7a66b83925349d5c9f9e5a9 (diff) | |
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 <johannes.schindelin@gmx.de>
Diffstat (limited to 'lib/vtls/vtls.c')
| -rw-r--r-- | lib/vtls/vtls.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; } |