- win32 build now has libcurl v7.16.0

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index 7bbe8e921d4bef6d6b34b1e99239ca658e26f0a6..9fd3b752666dfb299b945a43f72223b6b3e1ff06 100644 (file)
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -358,7 +358,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
                                                        const char *key = header;
                                                        
                                                        /* skip leading ws */
-                                                       while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen && ++key;
+                                                       while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key;
                                                        /* skip trailing ws */
                                                        while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen;
                                                        
@@ -466,13 +466,14 @@ PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c
        char *name;
        uint name_len = strlen(header);
        zend_bool result = 0;
-       zval **data;
+       zval **data, *zvalue;
 
        http_get_request_headers(NULL);
        name = pretty_key(estrndup(header, name_len), name_len, 1, 1);
        if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) {
-               convert_to_string_ex(data);
-               result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
+               zvalue = zval_copy(IS_STRING, *data);
+               result = (match_case ? strcmp(Z_STRVAL_P(zvalue), value) : strcasecmp(Z_STRVAL_P(zvalue), value)) ? 0 : 1;
+               zval_free(&zvalue);
        }
        efree(name);