X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=ef5099f8681a899421e17c6229a0ed052a2b1cfe;hp=0952ffbe32c0162b42aba7774408f86447549998;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f diff --git a/http_headers_api.c b/http_headers_api.c index 0952ffb..ef5099f 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" @@ -28,18 +24,6 @@ # define HTTP_DBG_NEG 0 #endif -/* {{{ */ -PHP_MINIT_FUNCTION(http_headers) -{ - HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT); - HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM); - HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST); - HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP); - - return SUCCESS; -} -/* }}} */ - /* {{{ static int http_sort_q(const void *, const void *) */ static int http_sort_q(const void *a, const void *b TSRMLS_DC) { @@ -159,7 +143,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) { const char *ptr = separator; - while (*++ptr && !isdigit(*ptr) && '.' != *ptr); + while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr); quality = atof(ptr); identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry)); @@ -169,11 +153,11 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support } freeme = identifier; - while (isspace(*identifier)) { + while (HTTP_IS_CTYPE(space, *identifier)) { ++identifier; --ident_len; } - while (ident_len && isspace(identifier[ident_len - 1])) { + while (ident_len && HTTP_IS_CTYPE(space, identifier[ident_len - 1])) { identifier[--ident_len] = '\0'; } @@ -216,14 +200,13 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ range += sizeof("bytes=") - 1; do { - switch (c = *(range++)) - { + switch (c = *(range++)) { case '0': /* allow 000... - shall we? */ if (*ptr != -10) { *ptr *= 10; } - break; + break; case '1': case '2': case '3': case '4': case '5': case '6': @@ -245,23 +228,21 @@ 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-" */ @@ -273,7 +254,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ return RANGE_ERR; } begin = 0; - break; + break; /* "-12345" */ case -1: @@ -283,16 +264,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: @@ -300,7 +279,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: @@ -309,9 +288,9 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ (end < begin)) { return RANGE_ERR; } - break; + break; } - break; + break; } } { @@ -326,11 +305,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); @@ -342,29 +320,25 @@ 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 (HTTP_IS_CTYPE(space, *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++) - { + + switch (*line++) { case ':': if (!colon) { colon = line - 1; } - break; + break; case 0: --value_len; /* we don't have CR so value length is one char less */ @@ -372,106 +346,114 @@ 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 && 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; + break; } - } while (header_len > (size_t) (line - begin)); + } while (MORE_HEADERS); return SUCCESS; } /* }}} */ -/* {{{ 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) +/* {{{ 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; - zval array, **hsv; + HashKey key = initHashKey(0); + zval **hsv, **header; HashPosition pos; - - Z_ARRVAL(array) = headers; - - 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; - - key += 5; - keylen -= 6; - if (prettify) { - key = pretty_key(estrndup(key, keylen), keylen, 1, 1); - } - zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void **) &header, &pos); - - orig = *header; - convert_to_string_ex(header); - add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1); - if (orig != *header) { - zval_ptr_dtor(header); - } - - if (prettify) { - efree(key); + 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); } - - key = NULL; - keylen = 0; } } } + + if (headers) { + zend_hash_copy(headers, HTTP_G->request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + } } /* }}} */ @@ -481,17 +463,15 @@ 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; - HashTable headers; - zval **data; + zval **data, *zvalue; + http_get_request_headers(NULL); name = pretty_key(estrndup(header, name_len), name_len, 1, 1); - 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)) { - result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1; + if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) { + 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); } - zend_hash_destroy(&headers); efree(name); return result;