X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=176dc298d82000c1e197d904a4e1689dbf4605a2;hb=a3d5c57e92d773fb4bab2b5a1566bc0e8b9ce5a5;hp=ef62218a47aced31719d3d6f012090aa64fcae6a;hpb=8331a664f8eb649250252eb99885a99773cdd700;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index ef62218..176dc29 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -458,7 +458,11 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_PROXY, NULL);
 		HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0L);
 		HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L);
-		HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
+		/* 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_DNS_CACHE_TIMEOUT, 60L);
 		HTTP_CURL_OPT(CURLOPT_IPRESOLVE, 0);
@@ -476,11 +480,18 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_FORBID_REUSE, 0L);
 		HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
 		HTTP_CURL_OPT(CURLOPT_PORT, 0L);
+#if HTTP_CURL_VERSION(7,19,0)
+		HTTP_CURL_OPT(CURLOPT_ADDRESS_SCOPE, 0L);
+#endif
 #if HTTP_CURL_VERSION(7,15,2)
 		HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0L);
 		HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0L);
 #endif
-		HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
+		/* 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)
@@ -494,6 +505,9 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")");
 		HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 0L);
+		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL);
 #if HTTP_CURL_VERSION(7,14,1)
 		HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
 #endif