From: Michael Wallner <mike@php.net>
Date: Tue, 29 Dec 2009 12:19:49 +0000 (+0000)
Subject: don't enable curls cookie engine by default & accident
X-Git-Tag: RELEASE_1_7_0b2~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=14c5fd32278ae1d4c127acdde4d8f63eb87cab60;p=m6w6%2Fext-http

don't enable curls cookie engine by default & accident
---

diff --git a/http_request_api.c b/http_request_api.c
index 2a5f68e..d2440b7 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -531,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);
+		/* 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