fix usage of hash_init() in 8.1

[m6w6/ext-http] / src / php_http_client_curl.c

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 389464bad77f4fc77c17016892c6bd8848740f6b..9a6ce26d506872a321bf95b3e09d681d62d14898 100644 (file)
--- 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)) {
@@ -2075,9 +2077,7 @@ 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 */
-       //if (php_http_curle_get_storage(handler->handle)->cookiestore) {
-               //curl_easy_setopt(handler->handle, CURLOPT_COOKIEJAR, NULL);
-       //}
+       curl_easy_setopt(handler->handle, CURLOPT_COOKIEJAR, NULL);
 }
 
 static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler)