romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 02:03:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl_version_info: add CURL_VERSION_HTTPS_PROXY

Browse source 
Closes #1142
This commit is contained in:
Okhin Vasilij 2016-11-25 16:27:22 +07:00 • committed by Daniel Stenberg
parent e38fe7abbf
commit a4b2f7aafd
12 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/url.c
View file

@ -4924,6 +4924,14 @@ static CURLcode parse_proxy(struct Curl_easy *data,
else
proxyptr = proxy; /* No xxx:// head: It's a HTTP proxy */
#ifndef HTTPS_PROXY_SUPPORT
if(proxytype == CURLPROXY_HTTPS) {
failf(data, "Unsupported proxy \'%s\'"
", libcurl is built without the HTTPS-proxy support.", proxy);
return CURLE_NOT_BUILT_IN;
}
#endif
sockstype = proxytype == CURLPROXY_SOCKS5_HOSTNAME ||
proxytype == CURLPROXY_SOCKS5 ||
proxytype == CURLPROXY_SOCKS4A ||

3
lib/version.c
View file

@ -323,6 +323,9 @@ static curl_version_info_data version_info = {
#endif
#if defined(USE_LIBPSL)
| CURL_VERSION_PSL
#endif
#if defined(HTTPS_PROXY_SUPPORT)
| CURL_VERSION_HTTPS_PROXY
#endif
,
NULL, /* ssl_version */

3
lib/vtls/gskit.h
View file

@ -41,6 +41,9 @@ int Curl_gskit_shutdown(struct connectdata *conn, int sockindex);
size_t Curl_gskit_version(char *buffer, size_t size);
int Curl_gskit_check_cxn(struct connectdata *cxn);
/* Support HTTPS-proxy */
/* TODO: add '#define HTTPS_PROXY_SUPPORT 1' and fix test #1014 (if need) */
/* Set the API backend definition to GSKit */
#define CURL_SSL_BACKEND CURLSSLBACKEND_GSKIT

3
lib/vtls/gtls.h
View file

@ -57,6 +57,9 @@ void Curl_gtls_sha256sum(const unsigned char *tmp, /* input */
bool Curl_gtls_cert_status_request(void);
/* Support HTTPS-proxy */
#define HTTPS_PROXY_SUPPORT 1
/* Set the API backend definition to GnuTLS */
#define CURL_SSL_BACKEND CURLSSLBACKEND_GNUTLS

3
lib/vtls/nssg.h
View file

@ -65,6 +65,9 @@ bool Curl_nss_cert_status_request(void);
bool Curl_nss_false_start(void);
/* Support HTTPS-proxy */
#define HTTPS_PROXY_SUPPORT 1
/* Set the API backend definition to NSS */
#define CURL_SSL_BACKEND CURLSSLBACKEND_NSS

3
lib/vtls/openssl.h
View file

@ -79,6 +79,9 @@ void Curl_ossl_sha256sum(const unsigned char *tmp, /* input */
bool Curl_ossl_cert_status_request(void);
/* Support HTTPS-proxy */
#define HTTPS_PROXY_SUPPORT 1
/* Set the API backend definition to OpenSSL */
#define CURL_SSL_BACKEND CURLSSLBACKEND_OPENSSL

3
lib/vtls/vtls.c
View file

@ -187,8 +187,7 @@ 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(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_NSS) || \
defined(USE_GSKIT)
#if defined(HTTPS_PROXY_SUPPORT)
conn->proxy_ssl[sockindex] = conn->ssl[sockindex];
memset(&conn->ssl[sockindex], 0, sizeof(conn->ssl[sockindex]));
#else