projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
prepare 1.6.6
[m6w6/ext-http]
/
http_request_api.c
diff --git
a/http_request_api.c
b/http_request_api.c
index 176dc298d82000c1e197d904a4e1689dbf4605a2..14734b9364aeaf05e8ad98310b11f9d57372635f 100644
(file)
--- a/
http_request_api.c
+++ b/
http_request_api.c
@@
-462,6
+462,8
@@
PHP_HTTP_API void _http_request_defaults(http_request *request)
#if HTTP_CURL_VERSION(7,19,1)
HTTP_CURL_OPT(CURLOPT_PROXYUSERNAME, NULL);
HTTP_CURL_OPT(CURLOPT_PROXYPASSWORD, 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);
#endif
HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
@@
-491,6
+493,8
@@
PHP_HTTP_API void _http_request_defaults(http_request *request)
#if HTTP_CURL_VERSION(7,19,1)
HTTP_CURL_OPT(CURLOPT_USERNAME, NULL);
HTTP_CURL_OPT(CURLOPT_PASSWORD, 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);
#endif
HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
@@
-506,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);
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_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
#if HTTP_CURL_VERSION(7,14,1)
HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
#endif