Commit a4b2f7aa authored by Okhin Vasilij's avatar Okhin Vasilij Committed by Daniel Stenberg
Browse files

curl_version_info: add CURL_VERSION_HTTPS_PROXY 

Closes #1142
parent e38fe7ab

configure.ac

+5 −0
Original line number Diff line number Diff line
@@ -3710,6 +3710,11 @@ if test "x$USE_NGHTTP2" = "x1"; then 
  SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2"

fi



if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \

    -o "x$NSS_ENABLED" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES HTTPS-proxy"

fi



AC_SUBST(SUPPORT_FEATURES)



dnl For supported protocols in pkg-config file

docs/libcurl/curl_version_info.3

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ libcurl was built with support for Unix domain sockets. 
libcurl was built with support for Mozilla's Public Suffix List. This makes

libcurl ignore cookies with a domain that's on the list.

(Added in 7.47.0)

.IP CURL_VERSION_HTTPS_PROXY

libcurl was built with support for HTTPS-proxy.

(Added in 7.52.0)

.RE

\fIssl_version\fP is an ASCII string for the OpenSSL version used. If libcurl

has no SSL support, this is NULL.

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ CURL_VERSION_DEBUG 7.10.6 
CURL_VERSION_GSSAPI             7.38.0

CURL_VERSION_GSSNEGOTIATE       7.10.6        7.38.0

CURL_VERSION_HTTP2              7.33.0

CURL_VERSION_HTTPS_PROXY        7.52.0

CURL_VERSION_IDN                7.12.0

CURL_VERSION_IPV6               7.10

CURL_VERSION_KERBEROS4          7.10          7.33.0

include/curl/curl.h

+2 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ typedef enum { 
                           CONNECT HTTP/1.1 */

  CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT

                               HTTP/1.0  */

  CURLPROXY_HTTPS = 2, /* added in TBD */

  CURLPROXY_HTTPS = 2, /* added in 7.52.0 */

  CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already

                           in 7.10 */

  CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
@@ -2446,6 +2446,7 @@ typedef struct { 
#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */

#define CURL_VERSION_PSL          (1<<20) /* Mozilla's Public Suffix List, used

                                             for cookie domain verification */

#define CURL_VERSION_HTTPS_PROXY  (1<<21) /* HTTPS-proxy support built-in */



 /*

 * NAME curl_version_info()

lib/url.c

+8 −0
Original line number Diff line number Diff line
@@ -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 ||