PHP-5.3 zend_hash API compatibility fix

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index e20eb11524f3965cccd0af9a71370f64a1c23ef0..ab6920098d2b0310dcb0862ff9af2a2247794e69 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -476,7 +476,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
                HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
                HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
-               HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
+               HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")");
                HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
                HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
 #if HTTP_CURL_VERSION(7,14,1)
@@ -555,7 +555,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        if (!(storage = http_request_storage_get(request->ch))) {
                return FAILURE;
        }
-       
+       storage->errorbuffer[0] = '\0';
        /* set options */
        if (storage->url) {
                pefree(storage->url, 1);
@@ -772,14 +772,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                        if (header_key.type == HASH_KEY_IS_STRING) {
                                char header[1024];
                                
-                               ZVAL_ADDREF(*header_val);
                                convert_to_string_ex(header_val);
                                if (!strcasecmp(header_key.str, "range")) {
                                        range_req = 1;
                                }
                                snprintf(header, sizeof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
                                request->_cache.headers = curl_slist_append(request->_cache.headers, header);
-                               zval_ptr_dtor(header_val);
                        }
                }
        }