- no more PHP-5.0 only tests

[m6w6/ext-http] / http_headers_api.c

diff --git a/http_headers_api.c b/http_headers_api.c
index 7bbe8e921d4bef6d6b34b1e99239ca658e26f0a6..ef5099f8681a899421e17c6229a0ed052a2b1cfe 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;
                                                        
@@ -423,9 +423,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 /* {{{ void http_get_request_headers(HashTable *) */
 PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
 {
-       char *key = NULL;
-       ulong idx = 0;
-       uint keylen = 0;
+       HashKey key = initHashKey(0);
        zval **hsv, **header;
        HashPosition pos;
        
@@ -438,17 +436,16 @@ PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
 #endif
                
                if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
-                       FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) {
-                               if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) {
-                                       keylen -= 6;
-                                       key = pretty_key(estrndup(key + 5, keylen), keylen, 1, 1);
+                       FOREACH_KEY(pos, *hsv, key) {
+                               if (key.type == HASH_KEY_IS_STRING && key.len > 6 && !strncmp(key.str, "HTTP_", 5)) {
+                                       key.len -= 5;
+                                       key.str = pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1);
                                        
                                        zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
                                        ZVAL_ADDREF(*header);
-                                       zend_hash_add(HTTP_G->request.headers, key, keylen + 1, (void *) header, sizeof(zval *), NULL);
+                                       zend_hash_add(HTTP_G->request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
                                        
-                                       STR_SET(key, NULL)
-                                       keylen = 0;
+                                       efree(key.str);
                                }
                        }
                }
@@ -466,13 +463,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);