projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
facilitate zend_exception_set_previous() of PHP 5.3
[m6w6/ext-http]
/
http_request_api.c
diff --git
a/http_request_api.c
b/http_request_api.c
index 1d1252a0988399b783dd28089ec9f847246f4990..d2440b73e555bfb236919b403210358e13ed442f 100644
(file)
--- 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 */
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);
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);
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 */
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);
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)
HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
#if HTTP_CURL_VERSION(7,16,2)
@@
-527,8
+531,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