X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=7211304470f48e668441e770ddee46855e26a588;hp=9fd3b752666dfb299b945a43f72223b6b3e1ff06;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=d92a99b21f8fd9a43a7ff0a379533bfeb82817a6 diff --git a/http_headers_api.c b/http_headers_api.c index 9fd3b75..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; @@ -145,7 +156,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support 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++; @@ -189,15 +200,12 @@ 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++)) { @@ -245,13 +253,21 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ 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; @@ -423,9 +439,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 +452,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); } } } @@ -460,6 +473,23 @@ PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC) } /* }}} */ +/* {{{ 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; +} +/* }}} */ + /* {{{ 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) { @@ -471,9 +501,9 @@ PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c 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 = zval_copy(IS_STRING, *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_free(&zvalue); + zval_ptr_dtor(&zvalue); } efree(name);