X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=14734b9364aeaf05e8ad98310b11f9d57372635f;hb=4d9912d654613f76a07e9445189f2315731af507;hp=9d7e2d00f377885d12aa6d61ca982334862cb358;hpb=cfdce2d63829637d1f658bf67bddef7c68a532aa;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index 9d7e2d0..14734b9 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -459,8 +459,12 @@ 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);
+#else
+		HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
 		HTTP_CURL_OPT(CURLOPT_IPRESOLVE, 0);
@@ -486,8 +490,12 @@ 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);
+#else
+		HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
 #if HTTP_CURL_VERSION(7,16,2)
@@ -502,8 +510,9 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 0L);
+		/* these options would enable curl's cookie engine by default which we don't want
 		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
-		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL); */
 #if HTTP_CURL_VERSION(7,14,1)
 		HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
 #endif