X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_headers_api.c;h=37e16cd2eb8b08f323678b31ea354887895eebab;hb=04403e78125a72f38fcd145a8dc0809e348e39d3;hp=81181e5711e6141b9cf4c653c72506b8fd2e721f;hpb=74c406d2e8a73540d9df9b888a17c86b0bb7fc2c;p=m6w6%2Fext-http diff --git a/http_headers_api.c b/http_headers_api.c index 81181e5..37e16cd 100644 --- a/http_headers_api.c +++ b/http_headers_api.c @@ -18,10 +18,8 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - -#include - #include "php.h" + #include "ext/standard/php_string.h" #include "ext/standard/url.h" @@ -30,6 +28,10 @@ #include "php_http_api.h" #include "php_http_headers_api.h" +#include + +ZEND_EXTERN_MODULE_GLOBALS(http); + /* {{{ static int http_sort_q(const void *, const void *) */ static int http_sort_q(const void *a, const void *b TSRMLS_DC) { @@ -76,6 +78,7 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *support } else { qual = 1000.0 - i++; } + /* 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); @@ -111,7 +114,6 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ range = Z_STRVAL_P(zrange); if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) { - http_error(E_NOTICE, HTTP_E_HEADER, "Range header misses bytes="); return RANGE_NO; } @@ -122,7 +124,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ switch (c = *(range++)) { case '0': - *ptr *= 10; + /* allow 000... - shall we? */ + if (*ptr != -10) { + *ptr *= 10; + } break; case '1': case '2': case '3': @@ -169,7 +174,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ return RANGE_NO; } /* "0-0" or overflow */ - if (end == -10 || length <= end) { + if (end == -10 || length <= (size_t) end) { return RANGE_ERR; } begin = 0; @@ -178,7 +183,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ /* "-12345" */ case -1: /* "-", "-0" or overflow */ - if (end == -1 || end == -10 || length <= end) { + if (end == -1 || end == -10 || length <= (size_t) end) { return RANGE_ERR; } begin = length - end; @@ -196,7 +201,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ /* "12345-" */ case -1: - if (length <= begin) { + if (length <= (size_t) begin) { return RANGE_ERR; } end = length - 1; @@ -204,8 +209,8 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ /* "12345-67890" */ default: - if ( (length <= begin) || - (length <= end) || + if ( (length <= (size_t) begin) || + (length <= (size_t) end) || (end < begin)) { return RANGE_ERR; } @@ -255,13 +260,13 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header if (header_len < 2 || !strchr(header, ':')) { - http_error(E_WARNING, HTTP_E_PARSE, "Cannot parse too short or malformed HTTP headers"); + http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Cannot parse too short or malformed HTTP headers"); return FAILURE; } line = header; - while (header_len >= (line - begin)) { + while (header_len >= (size_t) (line - begin)) { int value_len = 0; switch (*line++) @@ -366,99 +371,29 @@ PHP_HTTP_API void _http_parse_headers_default_callback(const char *http_line, Ha } } -/* {{{ */ -PHP_HTTP_API STATUS _http_parse_cookie(const char *cookie, HashTable *values TSRMLS_DC) -{ - const char *key = cookie, *val = NULL; - int vallen = 0, keylen = 0, done = 0; - zval array; - - Z_ARRVAL(array) = values; - - if (!(val = strchr(cookie, '='))) { - return FAILURE; - } - -#define HTTP_COOKIE_VAL(array, k, str, len) \ - { \ - const char *encoded = str; \ - char *decoded = NULL; \ - int decoded_len = 0, encoded_len = len; \ - decoded = estrndup(encoded, encoded_len); \ - decoded_len = php_url_decode(decoded, encoded_len); \ - add_assoc_stringl(array, k, decoded, decoded_len, 0); \ - } -#define HTTP_COOKIE_FIXKEY() \ - { \ - while (isspace(*key)) ++key; \ - keylen = val - key; \ - while (isspace(key[keylen - 1])) --keylen; \ - } -#define HTTP_COOKIE_FIXVAL() \ - { \ - ++val; \ - while (isspace(*val)) ++val; \ - vallen = key - val; \ - while (isspace(val[vallen - 1])) --vallen; \ - } - - HTTP_COOKIE_FIXKEY(); - HTTP_COOKIE_VAL(&array, "name", key, keylen); - - /* just a name=value cookie */ - if (!(key = strchr(val, ';'))) { - key = val + strlen(val); - HTTP_COOKIE_FIXVAL(); - HTTP_COOKIE_VAL(&array, "value", val, vallen); - } - /* additional info appended */ - else { - char *keydup = NULL; - - HTTP_COOKIE_FIXVAL(); - HTTP_COOKIE_VAL(&array, "value", val, vallen); - - do { - if (!(val = strchr(key, '='))) { - break; - } - ++key; - HTTP_COOKIE_FIXKEY(); - keydup = estrndup(key, keylen); - if (!(key = strchr(val, ';'))) { - done = 1; - key = val + strlen(val); - } - HTTP_COOKIE_FIXVAL(); - HTTP_COOKIE_VAL(&array, keydup, val, vallen); - efree(keydup); - } while (!done); - } - 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) { char *key = NULL; - long idx = 0; - zval array; + ulong idx = 0; + zval array, **hsv; 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); + if (SUCCESS == zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &hsv)) { + FOREACH_KEY(*hsv, 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(Z_ARRVAL_PP(hsv), (void **) &header); + add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1); + key = NULL; } - - 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; } } }