X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=70f36ce285052578b8df7acc1c4914d1054007f9;hp=96110d337779e2441f56668f9ab0a9db92463aa7;hb=5773d11d8c9c28fb8b0e3389258f548fc4717892;hpb=fa1a275e2b5e1b9dfb5bcbf97b51ef2b568e433c diff --git a/http_headers_api.c b/http_headers_api.c index 96110d3..70f36ce 100644 --- a/http_headers_api.c +++ b/http_headers_api.c @@ -12,10 +12,6 @@ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "php_http.h" #include "ext/standard/url.h" @@ -330,22 +326,19 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ 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; - const char *body = http_locate_body(header); - size_t header_len; + const char *colon = NULL, *line = NULL; zval array; - + INIT_ZARR(array, headers); - if (body) { - header_len = body - header; - } else { - header_len = strlen(header) + 1; - } + /* skip leading ws */ + while (isspace(*header)) ++header; line = header; - if (header_len) do { +#define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r'))) + do { int value_len = 0; + switch (*line++) { case ':': @@ -360,53 +353,67 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) { http_info i; - /* response/request line */ 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 - - /* "header: value" pair */ - if (colon) { - - /* skip empty key */ + } 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 && isspace(*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 && isspace(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); } - add_next_index_stringl(*previous, value, value_len, 0); - } else { - add_assoc_stringl(&array, key, value, value_len, 0); + + value_len += line - colon - 1; + + /* skip leading ws */ + while (isspace(*(++colon))) --value_len; + /* 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, 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; @@ -414,7 +421,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header } break; } - } while (header_len > (size_t) (line - begin)); + } while (MORE_HEADERS); return SUCCESS; } @@ -430,8 +437,10 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre HashPosition pos; Z_ARRVAL(array) = headers; - - if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) { +#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)) { FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) { if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) { zval **header, *orig; @@ -442,7 +451,7 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre key = pretty_key(estrndup(key, keylen), keylen, 1, 1); } - zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void **) &header, &pos); + zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos); orig = *header; convert_to_string_ex(header); @@ -476,7 +485,7 @@ PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0); http_get_request_headers_ex(&headers, 1); - if (SUCCESS == zend_hash_find(&headers, name, name_len+1, (void **) &data)) { + if (SUCCESS == zend_hash_find(&headers, name, name_len+1, (void *) &data)) { result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1; } zend_hash_destroy(&headers);