From: Michael Wallner <mike@php.net>
Date: Mon, 2 Jan 2006 16:33:22 +0000 (+0000)
Subject: - CURLOPT_COOKIELIST requires 7.14.1 not 7.15.x
X-Git-Tag: RELEASE_0_21_0~2
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=fac50662a1ea545b40f15613f8c4806a1ed745b0

- CURLOPT_COOKIELIST requires 7.14.1 not 7.15.x
---

diff --git a/http_request_api.c b/http_request_api.c
index 1a8b143..1a86c93 100644
--- 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 7bbff78..47c944c 100644
--- 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