- Fixed build on php-trunk
[m6w6/ext-http] / http_headers_api.c
index 11815f25a835a81112da1a08c6aad73628cbf063..7211304470f48e668441e770ddee46855e26a588 100644 (file)
@@ -1,36 +1,37 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-#include "php.h"
+#define HTTP_WANT_SAPI
+#include "php_http.h"
 
-#include "ext/standard/php_string.h"
 #include "ext/standard/url.h"
+#include "ext/standard/php_string.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_headers_api.h"
 
-#include <ctype.h>
+#ifndef HTTP_DBG_NEG
+#      define HTTP_DBG_NEG 0
+#endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+/* {{{ static void http_grab_response_headers(void *, void *) */
+static void http_grab_response_headers(void *data, void *arg TSRMLS_DC)
+{
+       phpstr_appendl(PHPSTR(arg), ((sapi_header_struct *)data)->header);
+       phpstr_appends(PHPSTR(arg), HTTP_CRLF);
+}
+/* }}} */
 
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
@@ -51,55 +52,144 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ char *http_negotiate_q(char *, HashTable *, char *) */
-PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *supported,    const char *def TSRMLS_DC)
+/* {{{ char *http_negotiate_language_func */
+char *_http_negotiate_language_func(const char *test, double *quality, HashTable *supported TSRMLS_DC)
 {
-       zval *zaccept, zdelim, zarray, zentries, **zentry, **zsupp;
-       char *q_ptr = NULL, *key = NULL;
-       int i = 0;
-       ulong idx = 0;
-       double qual;
-
-       HTTP_GSC(zaccept, entry, estrdup(def));
-
-       array_init(&zarray);
-       array_init(&zentries);
-
-       Z_STRVAL(zdelim) = ",";
-       Z_STRLEN(zdelim) = 1;
-
-       php_explode(&zdelim, zaccept, &zarray, -1);
-
-       FOREACH_HASH_VAL(Z_ARRVAL(zarray), zentry) {
-               if (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';')) {
-                       qual = strtod(q_ptr + 3, NULL);
-                       *q_ptr = 0;
-                       q_ptr = NULL;
-               } else {
-                       qual = 1000.0 - i++;
+       zval **value;
+       HashPosition pos;
+       const char *dash_test;
+       
+       FOREACH_HASH_VAL(pos, supported, value) {
+#if HTTP_DBG_NEG
+               fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test);
+#endif
+               if (!strcasecmp(Z_STRVAL_PP(value), test)) {
+                       return Z_STRVAL_PP(value);
                }
-               /* TODO: support primaries only, too */
-               FOREACH_HASH_VAL((HashTable *)supported, zsupp) {
-                       if (!strcasecmp(Z_STRVAL_PP(zsupp), Z_STRVAL_PP(zentry))) {
-                               add_assoc_double(&zentries, Z_STRVAL_PP(zsupp), qual);
-                               break;
+       }
+       
+       /* no distinct match found, so try primaries */
+       if ((dash_test = strchr(test, '-'))) {
+               FOREACH_HASH_VAL(pos, supported, value) {
+                       int len = dash_test - test;
+#if HTTP_DBG_NEG
+                       fprintf(stderr, "strncasecmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len);
+#endif
+                       if (    (!strncasecmp(Z_STRVAL_PP(value), test, len)) &&
+                                       (       (Z_STRVAL_PP(value)[len] == '\0') || 
+                                               (Z_STRVAL_PP(value)[len] == '-'))) {
+                               *quality *= .9;
+                               return Z_STRVAL_PP(value);
                        }
                }
        }
-       zval_dtor(&zarray);
-
-       zend_hash_sort(Z_ARRVAL(zentries), zend_qsort, http_sort_q, 0 TSRMLS_CC);
+       
+       return NULL;
+}
+/* }}} */
 
-       FOREACH_HASH_KEY(Z_ARRVAL(zentries), key, idx) {
-               if (key) {
-                       key = estrdup(key);
-                       zval_dtor(&zentries);
-                       return key;
+/* {{{ char *http_negotiate_default_func */
+char *_http_negotiate_default_func(const char *test, double *quality, HashTable *supported TSRMLS_DC)
+{
+       zval **value;
+       HashPosition pos;
+       
+       FOREACH_HASH_VAL(pos, supported, value) {
+#if HTTP_DBG_NEG
+               fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test);
+#endif
+               if (!strcasecmp(Z_STRVAL_PP(value), test)) {
+                       return Z_STRVAL_PP(value);
                }
        }
-       zval_dtor(&zentries);
+       
+       return NULL;
+}
+/* }}} */
 
-       return estrdup(def);
+/* {{{ HashTable *http_negotiate_q(const char *, HashTable *, negotiate_func_t) */
+PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC)
+{
+       zval *accept;
+       HashTable *result = NULL;
+       
+#if HTTP_DBG_NEG
+       fprintf(stderr, "Reading header %s: ", header);
+#endif
+       if (!(accept = http_get_server_var(header, 1))) {
+               return NULL;
+       }
+#if HTTP_DBG_NEG
+       fprintf(stderr, "%s\n", Z_STRVAL_P(accept));
+#endif
+       
+       if (Z_STRLEN_P(accept)) {
+               zval ex_arr, ex_del;
+               
+               INIT_PZVAL(&ex_del);
+               INIT_PZVAL(&ex_arr);
+               ZVAL_STRINGL(&ex_del, ",", 1, 0);
+               array_init(&ex_arr);
+               
+               php_explode(&ex_del, accept, &ex_arr, INT_MAX);
+               
+               if (zend_hash_num_elements(Z_ARRVAL(ex_arr)) > 0) {
+                       int i = 0;
+                       HashPosition pos;
+                       zval **entry, array;
+                       
+                       INIT_PZVAL(&array);
+                       array_init(&array);
+                       
+                       FOREACH_HASH_VAL(pos, Z_ARRVAL(ex_arr), entry) {
+                               int ident_len;
+                               double quality;
+                               char *selected, *identifier, *freeme;
+                               const char *separator;
+                               
+#if HTTP_DBG_NEG
+                               fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry));
+#endif
+                               
+                               if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) {
+                                       const char *ptr = separator;
+                                       
+                                       while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr);
+                                       
+                                       quality = zend_strtod(ptr, NULL);
+                                       identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
+                               } else {
+                                       quality = 1000.0 - i++;
+                                       identifier = estrndup(Z_STRVAL_PP(entry), ident_len = Z_STRLEN_PP(entry));
+                               }
+                               freeme = identifier;
+                               
+                               while (HTTP_IS_CTYPE(space, *identifier)) {
+                                       ++identifier;
+                                       --ident_len;
+                               }
+                               while (ident_len && HTTP_IS_CTYPE(space, identifier[ident_len - 1])) {
+                                       identifier[--ident_len] = '\0';
+                               }
+                               
+                               if ((selected = neg(identifier, &quality, supported TSRMLS_CC))) {
+                                       /* don't overwrite previously set with higher quality */
+                                       if (!zend_hash_exists(Z_ARRVAL(array), selected, strlen(selected) + 1)) {
+                                               add_assoc_double(&array, selected, quality);
+                                       }
+                               }
+                               
+                               efree(freeme);
+                       }
+                       
+                       result = Z_ARRVAL(array);
+                       zend_hash_sort(result, zend_qsort, http_sort_q, 0 TSRMLS_CC);
+               }
+               
+               zval_dtor(&ex_arr);
+       }
+       
+       return result;
 }
 /* }}} */
 
@@ -110,22 +200,21 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
        char *range, c;
        long begin = -1, end = -1, *ptr;
 
-       HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO);
-       range = Z_STRVAL_P(zrange);
-
-       if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
+       if (    !(zrange = http_get_server_var("HTTP_RANGE", 1)) || 
+                       (size_t) Z_STRLEN_P(zrange) < lenof("bytes=") || strncmp(Z_STRVAL_P(zrange), "bytes=", lenof("bytes="))) {
                return RANGE_NO;
        }
-
+       range = Z_STRVAL_P(zrange) + lenof("bytes=");
        ptr = &begin;
-       range += sizeof("bytes=") - 1;
 
        do {
-               switch (c = *(range++))
-               {
+               switch (c = *(range++)) {
                        case '0':
-                               *ptr *= 10;
-                       break;
+                               /* allow 000... - shall we? */
+                               if (*ptr != -10) {
+                                       *ptr *= 10;
+                               }
+                               break;
 
                        case '1': case '2': case '3':
                        case '4': case '5': case '6':
@@ -147,35 +236,41 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                } else {
                                        *ptr = c - '0';
                                }
-                       break;
+                               break;
 
                        case '-':
                                ptr = &end;
-                       break;
+                               break;
 
                        case ' ':
-                               /* IE - ignore for now */
-                       break;
+                               break;
 
                        case 0:
                        case ',':
 
                                if (length) {
                                        /* validate ranges */
-                                       switch (begin)
-                                       {
+                                       switch (begin) {
                                                /* "0-12345" */
                                                case -10:
-                                                       /* "0-" */
-                                                       if (end == -1) {
-                                                               return RANGE_NO;
-                                                       }
-                                                       /* "0-0" or overflow */
-                                                       if (end == -10 || length <= (size_t) end) {
-                                                               return RANGE_ERR;
+                                                       switch (end) {
+                                                               /* "0-" */
+                                                               case -1:
+                                                                       return RANGE_NO;
+                                                                       
+                                                               /* "0-0" */
+                                                               case -10:
+                                                                       end = 0;
+                                                                       break;
+                                                                       
+                                                               default:
+                                                                       if (length <= (size_t) end) {
+                                                                               return RANGE_ERR;
+                                                                       }
+                                                                       break;
                                                        }
                                                        begin = 0;
-                                               break;
+                                                       break;
 
                                                /* "-12345" */
                                                case -1:
@@ -185,16 +280,14 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                        }
                                                        begin = length - end;
                                                        end = length - 1;
-                                               break;
+                                                       break;
 
                                                /* "12345-(xxx)" */
                                                default:
-                                                       switch (end)
-                                                       {
+                                                       switch (end) {
                                                                /* "12345-0" */
                                                                case -10:
                                                                        return RANGE_ERR;
-                                                               break;
 
                                                                /* "12345-" */
                                                                case -1:
@@ -202,7 +295,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                                                return RANGE_ERR;
                                                                        }
                                                                        end = length - 1;
-                                                               break;
+                                                                       break;
 
                                                                /* "12345-67890" */
                                                                default:
@@ -211,9 +304,9 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                                                                        (end    <  begin)) {
                                                                                return RANGE_ERR;
                                                                        }
-                                                               break;
+                                                                       break;
                                                        }
-                                               break;
+                                                       break;
                                        }
                                }
                                {
@@ -228,11 +321,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
                                        end = -1;
                                        ptr = &begin;
                                }
-                       break;
+                               break;
 
                        default:
                                return RANGE_NO;
-                       break;
                }
        } while (c != 0);
 
@@ -241,183 +333,178 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 /* }}} */
 
 /* {{{ STATUS http_parse_headers(char *, HashTable *, zend_bool) */
-PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, http_parse_headers_callback_t func, void **callback_data TSRMLS_DC)
+PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, 
+       http_info_callback callback_func, void **callback_data TSRMLS_DC)
 {
-       const char *colon = NULL, *line = NULL, *begin = header, *crlfcrlf = NULL;
-       size_t header_len;
+       const char *colon = NULL, *line = NULL;
        zval array;
-
-       Z_ARRVAL(array) = headers;
-
-       if (crlfcrlf = strstr(header, HTTP_CRLF HTTP_CRLF)) {
-               header_len = crlfcrlf - header + lenof(HTTP_CRLF);
-       } else {
-               header_len = strlen(header) + 1;
-       }
-
-
-       if (header_len < 2 || !strchr(header, ':')) {
-               http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Cannot parse too short or malformed HTTP headers");
-               return FAILURE;
-       }
-
+       
+       INIT_ZARR(array, headers);
+       
+       /* skip leading ws */
+       while (HTTP_IS_CTYPE(space, *header)) ++header;
        line = header;
-
-       while (header_len >= (size_t) (line - begin)) {
+       
+#define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r')))
+       do {
                int value_len = 0;
-
-               switch (*line++)
-               {
+               
+               switch (*line++) {
+                       case ':':
+                               if (!colon) {
+                                       colon = line - 1;
+                               }
+                               break;
+                       
                        case 0:
                                --value_len; /* we don't have CR so value length is one char less */
                        case '\n':
-                               if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
-                                       /* response/request line */
-                    if (    (!strncmp(header, "HTTP/1.", lenof("HTTP/1."))) ||
-                            (!strncmp(line - lenof("HTTP/1.x" HTTP_CRLF) + value_len, "HTTP/1.", lenof("HTTP/1.")))) {
-                                               if (func) {
-                                                       func(header, &headers, callback_data TSRMLS_CC);
-                                                       Z_ARRVAL(array) = headers;
-                                               }
-                                       } else
-
-                                       /* "header: value" pair */
-                                       if (colon) {
-
-                                               /* skip empty key */
+                               if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) {
+                                       http_info i;
+                                       
+                                       if (SUCCESS == http_info_parse(header, &i)) {
+                                               /* response/request line */
+                                               callback_func(callback_data, &headers, &i TSRMLS_CC);
+                                               http_info_dtor(&i);
+                                               Z_ARRVAL(array) = headers;
+                                       } else if (colon) {
+                                               /* "header: value" pair */
                                                if (header != colon) {
-                                                       zval **previous = NULL;
-                                                       char *value;
                                                        int keylen = colon - header;
-                                                       char *key = estrndup(header, keylen);
-
-                                                       if (prettify) {
-                                                               key = pretty_key(key, keylen, 1, 1);
-                                                       }
-
-                                                       value_len += line - colon - 1;
-
+                                                       const char *key = header;
+                                                       
                                                        /* skip leading ws */
-                                                       while (isspace(*(++colon))) --value_len;
+                                                       while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key;
                                                        /* skip trailing ws */
-                                                       while (isspace(colon[value_len - 1])) --value_len;
-
-                                                       if (value_len > 0) {
-                                                               value = estrndup(colon, value_len);
-                                                       } else {
-                                                               value = estrdup("");
-                                                               value_len = 0;
-                                                       }
-
-                                                       /* if we already have got such a header make an array of those */
-                                                       if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void **) &previous)) {
-                                                               /* convert to array */
-                                                               if (Z_TYPE_PP(previous) != IS_ARRAY) {
-                                                                       convert_to_array(*previous);
+                                                       while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen;
+                                                       
+                                                       if (keylen > 0) {
+                                                               zval **previous = NULL;
+                                                               char *value;
+                                                               char *keydup = estrndup(key, keylen);
+                                                               
+                                                               if (prettify) {
+                                                                       keydup = pretty_key(keydup, keylen, 1, 1);
+                                                               }
+                                                               
+                                                               value_len += line - colon - 1;
+                                                               
+                                                               /* skip leading ws */
+                                                               while (HTTP_IS_CTYPE(space, *(++colon))) --value_len;
+                                                               /* skip trailing ws */
+                                                               while (HTTP_IS_CTYPE(space, colon[value_len - 1])) --value_len;
+                                                               
+                                                               if (value_len > 0) {
+                                                                       value = estrndup(colon, value_len);
+                                                               } else {
+                                                                       value = estrdup("");
+                                                                       value_len = 0;
                                                                }
-                                                               add_next_index_stringl(*previous, value, value_len, 0);
-                                                       } else {
-                                                               add_assoc_stringl(&array, key, value, value_len, 0);
+                                                               
+                                                               /* if we already have got such a header make an array of those */
+                                                               if (SUCCESS == zend_hash_find(headers, keydup, keylen + 1, (void *) &previous)) {
+                                                                       /* convert to array */
+                                                                       if (Z_TYPE_PP(previous) != IS_ARRAY) {
+                                                                               convert_to_array(*previous);
+                                                                       }
+                                                                       add_next_index_stringl(*previous, value, value_len, 0);
+                                                               } else {
+                                                                       add_assoc_stringl(&array, keydup, value, value_len, 0);
+                                                               }
+                                                               efree(keydup);
+                                                       } else   {
+                                                               /* empty key ("   : ...") */
+                                                               return FAILURE;
                                                        }
-                                                       efree(key);
+                                               } else {
+                                                       /* empty key (": ...") */
+                                                       return FAILURE;
                                                }
+                                       } else if (MORE_HEADERS) {
+                                               /* a line without a colon */
+                                               return FAILURE;
                                        }
                                        colon = NULL;
                                        value_len = 0;
                                        header += line - header;
                                }
-                       break;
-
-                       case ':':
-                               if (!colon) {
-                                       colon = line - 1;
-                               }
-                       break;
+                               break;
                }
-       }
+       } while (MORE_HEADERS);
+
        return SUCCESS;
 }
 /* }}} */
 
-PHP_HTTP_API void _http_parse_headers_default_callback(const char *http_line, HashTable **headers, void **cb_data TSRMLS_DC)
+/* {{{ void http_get_request_headers(HashTable *) */
+PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
 {
-       zval array;
-       char *crlf = NULL;
-       size_t line_length;
-       Z_ARRVAL(array) = *headers;
-
-       if (crlf = strstr(http_line, HTTP_CRLF)) {
-               line_length = crlf - http_line;
-       } else {
-               line_length = strlen(http_line);
+       HashKey key = initHashKey(0);
+       zval **hsv, **header;
+       HashPosition pos;
+       
+       if (!HTTP_G->request.headers) {
+               ALLOC_HASHTABLE(HTTP_G->request.headers);
+               zend_hash_init(HTTP_G->request.headers, 0, NULL, ZVAL_PTR_DTOR, 0);
+               
+#ifdef ZEND_ENGINE_2
+               zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+#endif
+               
+               if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
+                       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.str, key.len, (void *) header, sizeof(zval *), NULL);
+                                       
+                                       efree(key.str);
+                               }
+                       }
+               }
        }
-
-       /* response */
-       if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
-               char *status = estrndup(http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x "));
-               add_assoc_stringl(&array, "Response Status", status, line_length - lenof("HTTP/1.x "), 0);
-       } else
-       /* request */
-       if (!strncmp(http_line + line_length - lenof("HTTP/1.x"), "HTTP/1.", lenof("HTTP/1."))) {
-               char *sep = strchr(http_line, ' ');
-               char *url = estrndup(sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1);
-               char *met = estrndup(http_line, sep - http_line);
-
-               add_assoc_stringl(&array, "Request Method", met, sep - http_line, 0);
-               add_assoc_stringl(&array, "Request Uri", url, strstr(sep, "HTTP/1.") - sep + 1 + 1, 0);
+       
+       if (headers) {
+               zend_hash_copy(headers, HTTP_G->request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
        }
 }
+/* }}} */
 
-/* {{{ void http_get_request_headers_ex(HashTable *, zend_bool) */
-PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC)
+/* {{{ STATUS http_get_response_headers(HashTable *) */
+PHP_HTTP_API STATUS _http_get_response_headers(HashTable *headers_ht TSRMLS_DC)
 {
-       char *key = NULL;
-       ulong idx = 0;
-       zval array;
-
-       Z_ARRVAL(array) = headers;
-
-       FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) {
-               if (key && !strncmp(key, "HTTP_", 5)) {
-                       zval **header;
-
-                       key += 5;
-                       if (prettify) {
-                               key = pretty_key(key, strlen(key), 1, 1);
-                       }
-
-                       zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header);
-                       add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
-                       key = NULL;
-               }
-       }
+       STATUS status;
+       phpstr headers;
+       
+       phpstr_init(&headers);
+       zend_llist_apply_with_argument(&SG(sapi_headers).headers, http_grab_response_headers, &headers TSRMLS_CC);
+       phpstr_fix(&headers);
+       
+       status = http_parse_headers_ex(PHPSTR_VAL(&headers), headers_ht, 1);
+       phpstr_dtor(&headers);
+       
+       return status;
 }
 /* }}} */
 
 /* {{{ zend_bool http_match_request_header(char *, char *) */
 PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const char *value, zend_bool match_case TSRMLS_DC)
 {
-       char *name, *key = NULL;
-       ulong idx;
+       char *name;
+       uint name_len = strlen(header);
        zend_bool result = 0;
-       HashTable headers;
-
-       name = pretty_key(estrdup(header), strlen(header), 1, 1);
-       zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
-       http_get_request_headers_ex(&headers, 1);
-
-       FOREACH_HASH_KEY(&headers, key, idx) {
-               if (key && (!strcmp(key, name))) {
-                       zval **data;
-
-                       if (SUCCESS == zend_hash_get_current_data(&headers, (void **) &data)) {
-                               result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
-                       }
-                       break;
-               }
+       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)) {
+               zvalue = http_zsep(IS_STRING, *data);
+               result = (match_case ? strcmp(Z_STRVAL_P(zvalue), value) : strcasecmp(Z_STRVAL_P(zvalue), value)) ? 0 : 1;
+               zval_ptr_dtor(&zvalue);
        }
-
-       zend_hash_destroy(&headers);
        efree(name);
 
        return result;