X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=7211304470f48e668441e770ddee46855e26a588;hp=fd94d8e037932cff846c9098fd0fc492e85d7dd7;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=aa2e3877377c283b4eb0db78a5e7ff183228f251 diff --git a/http_headers_api.c b/http_headers_api.c index fd94d8e..7211304 100644 --- a/http_headers_api.c +++ b/http_headers_api.c @@ -6,12 +6,13 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ +#define HTTP_WANT_SAPI #include "php_http.h" #include "ext/standard/url.h" @@ -24,6 +25,14 @@ # define HTTP_DBG_NEG 0 #endif +/* {{{ 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) { @@ -107,7 +116,9 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support #if HTTP_DBG_NEG fprintf(stderr, "Reading header %s: ", header); #endif - HTTP_GSC(accept, header, NULL); + if (!(accept = http_get_server_var(header, 1))) { + return NULL; + } #if HTTP_DBG_NEG fprintf(stderr, "%s\n", Z_STRVAL_P(accept)); #endif @@ -120,7 +131,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support ZVAL_STRINGL(&ex_del, ",", 1, 0); array_init(&ex_arr); - php_explode(&ex_del, accept, &ex_arr, -1); + php_explode(&ex_del, accept, &ex_arr, INT_MAX); if (zend_hash_num_elements(Z_ARRVAL(ex_arr)) > 0) { int i = 0; @@ -143,9 +154,9 @@ 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); + quality = zend_strtod(ptr, NULL); identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry)); } else { quality = 1000.0 - i++; @@ -153,11 +164,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'; } @@ -189,25 +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': /* allow 000... - shall we? */ if (*ptr != -10) { *ptr *= 10; } - break; + break; case '1': case '2': case '3': case '4': case '5': case '6': @@ -229,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: @@ -267,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: @@ -284,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: @@ -293,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; } } { @@ -310,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); @@ -326,22 +336,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 = header; + const char *colon = NULL, *line = NULL; zval array; INIT_ZARR(array, headers); + /* skip leading ws */ + while (HTTP_IS_CTYPE(space, *header)) ++header; + line = header; + #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 */ @@ -361,9 +374,9 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header const char *key = header; /* skip leading ws */ - while (keylen && isspace(*key)) --keylen && ++key; + while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key; /* skip trailing ws */ - while (keylen && isspace(key[keylen - 1])) --keylen; + while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen; if (keylen > 0) { zval **previous = NULL; @@ -377,9 +390,9 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header value_len += line - colon - 1; /* skip leading ws */ - while (isspace(*(++colon))) --value_len; + while (HTTP_IS_CTYPE(space, *(++colon))) --value_len; /* skip trailing ws */ - while (isspace(colon[value_len - 1])) --value_len; + while (HTTP_IS_CTYPE(space, colon[value_len - 1])) --value_len; if (value_len > 0) { value = estrndup(colon, value_len); @@ -415,7 +428,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header value_len = 0; header += line - header; } - break; + break; } } while (MORE_HEADERS); @@ -423,48 +436,57 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header } /* }}} */ -/* {{{ 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 (!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); + 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; - - 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 (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 *)); + } +} +/* }}} */ + +/* {{{ STATUS http_get_response_headers(HashTable *) */ +PHP_HTTP_API STATUS _http_get_response_headers(HashTable *headers_ht TSRMLS_DC) +{ + 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; } /* }}} */ @@ -474,17 +496,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 = 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;