limit the workaround for #84 to libcurl 7.63-7.64

fix #89

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf26107278755e06f57bcfee121e3a237efbad2..651aff1a5df9e0b38e509d5260277100232cc781 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # ChangeLog v4
 
 # ChangeLog v4
 

-## 4.0.0beta1
+## 4.0.0beta2, TBR
+
+* Fixed gh-issue #89: Cookie handling cannot be disabled since v3.2.1
+
+## 4.0.0beta1, 2020-09-23

 
 * PHP 8 compatibility
        - Drop ext-propro support:  
 
 * PHP 8 compatibility
        - Drop ext-propro support:  


@@ -11,6 +15,10 @@
 
 # ChangeLog v3
 
 
 # ChangeLog v3
 

+## 3.2.4, TBR
+
+* Fixed gh-issue #89: Cookie handling cannot be disabled since v3.2.1
+

 ## 3.2.3, 2019-10-29
 
 * Fixed Windows build (Jan Ehrhardt)
 ## 3.2.3, 2019-10-29
 
 * Fixed Windows build (Jan Ehrhardt)

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 9a6ce26d506872a321bf95b3e09d681d62d14898..8a28008634adb2352fc090aefe93ef8e434ab02a 100644 (file)
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -2077,7 +2077,9 @@ static void php_http_client_curl_handler_clear(php_http_client_curl_handler_t *h
        curl_easy_setopt(handler->handle, CURLOPT_COOKIELIST, "FLUSH");
        curl_easy_setopt(handler->handle, CURLOPT_SHARE, NULL);
        /* see gh issue #84 */
        curl_easy_setopt(handler->handle, CURLOPT_COOKIELIST, "FLUSH");
        curl_easy_setopt(handler->handle, CURLOPT_SHARE, NULL);
        /* see gh issue #84 */

+#if PHP_HTTP_CURL_VERSION(7,63,0) && !PHP_HTTP_CURL_VERSION(7,65,0)

        curl_easy_setopt(handler->handle, CURLOPT_COOKIEJAR, NULL);
        curl_easy_setopt(handler->handle, CURLOPT_COOKIEJAR, NULL);

+#endif

 }
 
 static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler)
 }
 
 static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler)