X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=2a5f68e7ab1c5e564ba4d0200b38972aa4167ccd;hp=1d1252a0988399b783dd28089ec9f847246f4990;hb=858f68584ad6016446801fccfa6bd82a94b5f512;hpb=20ee94e8fcdec7568c62e8791d4dd324e13323f9;ds=sidebyside diff --git a/http_request_api.c b/http_request_api.c index 1d1252a..2a5f68e 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -478,8 +478,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request) HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0L); HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L); /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */ +#if HTTP_CURL_VERSION(7,19,1) HTTP_CURL_OPT(CURLOPT_PROXYUSERNAME, NULL); HTTP_CURL_OPT(CURLOPT_PROXYPASSWORD, NULL); +#endif HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L); HTTP_CURL_OPT(CURLOPT_HTTPPROXYTUNNEL, 0L); HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L); @@ -506,8 +508,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request) HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0L); #endif /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */ +#if HTTP_CURL_VERSION(7,19,1) HTTP_CURL_OPT(CURLOPT_USERNAME, NULL); HTTP_CURL_OPT(CURLOPT_PASSWORD, NULL); +#endif HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L); HTTP_CURL_OPT(CURLOPT_ENCODING, NULL); #if HTTP_CURL_VERSION(7,16,2)