X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=2a5f68e7ab1c5e564ba4d0200b38972aa4167ccd;hp=817fa3a805af01da86e35de18b6c575aeb79868a;hb=858f68584ad6016446801fccfa6bd82a94b5f512;hpb=ec0bb29f312b0f825a44c059fa6a8e2d1cd708bb

diff --git a/http_request_api.c b/http_request_api.c
index 817fa3a..2a5f68e 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -477,7 +477,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_HTTPPROXYTUNNEL, 0L);
 		HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
@@ -496,11 +500,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)
@@ -519,6 +530,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