X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=8a28008634adb2352fc090aefe93ef8e434ab02a;hp=1c84e3dde7940d50d62ea544d3016ad66b1129e9;hb=4e5f36bd0b770444c8e5151c498fa96326e261c5;hpb=ad1dfac848dbbb295151c22b4f6fbcad13ce7a56 diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c index 1c84e3d..8a28008 100644 --- a/src/php_http_client_curl.c +++ b/src/php_http_client_curl.c @@ -46,7 +46,7 @@ typedef struct php_http_client_curl_handler { php_http_buffer_t ranges; struct { - uint count; + uint32_t count; double delay; } retry; @@ -331,7 +331,9 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info) long l = 0; double d = 0; struct curl_slist *s = NULL, *p = NULL; - zval tmp = {{0}}; + zval tmp; + + ZVAL_NULL(&tmp); /* BEGIN::CURLINFO */ if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_EFFECTIVE_URL, &c)) { @@ -2074,6 +2076,10 @@ static void php_http_client_curl_handler_clear(php_http_client_curl_handler_t *h curl_easy_setopt(handler->handle, CURLOPT_DEBUGFUNCTION, NULL); 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); +#endif } static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler)