- CURLOPT_COOKIELIST requires 7.14.1 not 7.15.x

diff --git a/http_request_api.c b/http_request_api.c
index 1a8b1436616304e3c0e30f7eef434f6a41bc3cdd..1a86c93c0ea5dbabdaeefa84223db10471055816 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -326,6 +326,9 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
                HTTP_CURL_OPT(HTTPHEADER, NULL);
                HTTP_CURL_OPT(COOKIE, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070e01
+               HTTP_CURL_OPT(COOKIELIST, NULL);
+#endif
                HTTP_CURL_OPT(COOKIEFILE, NULL);
                HTTP_CURL_OPT(COOKIEJAR, NULL);
                HTTP_CURL_OPT(RESUME_FROM, 0);
@@ -495,7 +498,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                }
        }
 
-#if LIBCURL_VERSION_NUM >= 0x070f01
+#if LIBCURL_VERSION_NUM >= 0x070e01
        /* reset cookies */
        if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) {
                HTTP_CURL_OPT(COOKIELIST, "ALL");

diff --git a/package2.xml b/package2.xml
index 7bbff78dfa3a1a2a26fdf7537c9b80789c6c0446..47c944ca19ed9cd73b292b70d65e38886547d201 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -51,7 +51,7 @@ HttpResponse
 + Added HttpDeflateStream and HttpInflateStream classes
 + Added ob_deflatehandler and ob_inflatehandler
 + Added HttpRequest::getRawRequestMessage and ::getRawResponseMessage
-+ Added 'resetcookies' request option (libcurl > 7.15)
++ Added 'resetcookies' request option (libcurl > 7.14.1)
 
 - Changed all methods and properties with "URI" in their name to "URL"
 - Changed HttpRequest properties to be private