X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=d573ab27b601aa4d0533cf9d28cc46b70b0adc9c;hp=96a8b66fb5ea573ec370f49d8cd704cfc0124767;hb=b562e34cf4f8c8fae7b8fe773e0eed71592b09c2;hpb=e32f6fed32939bba9839c0e4f7cdaec02d8828dd diff --git a/http_headers_api.c b/http_headers_api.c index 96a8b66..d573ab2 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" @@ -29,6 +27,11 @@ #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_headers_api.h" +#include "php_http_info_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 +79,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 +115,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 +125,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 +175,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 +184,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 +202,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 +210,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; } @@ -239,46 +245,46 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_ /* }}} */ /* {{{ STATUS http_parse_headers(char *, HashTable *, zend_bool) */ -PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, http_parse_headers_callback_t func, void **callback_data TSRMLS_DC) +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, *crlfcrlf = NULL; + const char *colon = NULL, *line = NULL, *begin = header; + const char *body = http_locate_body(header); size_t header_len; zval array; Z_ARRVAL(array) = headers; - - if (crlfcrlf = strstr(header, HTTP_CRLF HTTP_CRLF)) { - header_len = crlfcrlf - header + lenof(HTTP_CRLF); + if (body) { + header_len = body - header; } else { header_len = strlen(header) + 1; } - - - if (header_len < 2 || !strchr(header, ':')) { - http_error(E_WARNING, HTTP_E_PARSE, "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++) { + case ':': + if (!colon) { + colon = line - 1; + } + break; + case 0: --value_len; /* we don't have CR so value length is one char less */ case '\n': if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) { + http_info i; + /* response/request line */ - if ( (!strncmp(header, "HTTP/1.", lenof("HTTP/1."))) || - (!strncmp(line - lenof("HTTP/1.x" HTTP_CRLF) + value_len, "HTTP/1.", lenof("HTTP/1.")))) { - if (func) { - func(header, &headers, callback_data TSRMLS_CC); - Z_ARRVAL(array) = headers; - } + if (SUCCESS == http_info_parse(header, &i)) { + callback_func(callback_data, &headers, &i TSRMLS_CC); + http_info_dtor(&i); + Z_ARRVAL(array) = headers; } else - + /* "header: value" pair */ if (colon) { @@ -325,68 +331,35 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header header += line - header; } break; - - case ':': - if (!colon) { - colon = line - 1; - } - break; } } return SUCCESS; } /* }}} */ -PHP_HTTP_API void _http_parse_headers_default_callback(const char *http_line, HashTable **headers, void **cb_data TSRMLS_DC) -{ - zval array; - char *crlf = NULL; - size_t line_length; - Z_ARRVAL(array) = *headers; - - if (crlf = strstr(http_line, HTTP_CRLF)) { - line_length = crlf - http_line; - } else { - line_length = strlen(http_line); - } - - /* response */ - if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) { - char *status = estrndup(http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x ")); - add_assoc_stringl(&array, "Response Status", status, line_length - lenof("HTTP/1.x "), 0); - } else - /* request */ - if (!strncmp(http_line + line_length - lenof("HTTP/1.x"), "HTTP/1.", lenof("HTTP/1."))) { - char *sep = strchr(http_line, ' '); - char *url = estrndup(sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1); - char *met = estrndup(http_line, sep - http_line); - - add_assoc_stringl(&array, "Request Method", met, sep - http_line, 0); - add_assoc_stringl(&array, "Request Uri", url, strstr(sep, "HTTP/1.") - sep + 1 + 1, 0); - } -} - /* {{{ 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), "_SERVER", sizeof("_SERVER"), (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; } } }