X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=c26214592b02420628e66defb06a6c5fec29b03b;hp=b61646d34c4ac84cd7965d651fe6149f49fe8393;hb=f9a650f4b1ed0baad4a41f6e130991f328dc64b9;hpb=64f9c50ce4d7f7ecc5b414b46fe44c28bf54974d diff --git a/http_headers_api.c b/http_headers_api.c index b61646d..c262145 100644 --- a/http_headers_api.c +++ b/http_headers_api.c @@ -6,46 +6,24 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "php.h" +#include "php_http.h" -#include "ext/standard/php_string.h" #include "ext/standard/url.h" +#include "ext/standard/php_string.h" -#include "php_http.h" -#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); #ifndef HTTP_DBG_NEG # 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) { @@ -82,11 +60,11 @@ char *_http_negotiate_language_func(const char *test, double *quality, HashTable } /* no distinct match found, so try primaries */ - if (dash_test = strchr(test, '-')) { + if ((dash_test = strchr(test, '-'))) { FOREACH_HASH_VAL(pos, supported, value) { int len = dash_test - test; #if HTTP_DBG_NEG - fprintf(stderr, "strncascmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len); + fprintf(stderr, "strncasecmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len); #endif if ( (!strncasecmp(Z_STRVAL_PP(value), test, len)) && ( (Z_STRVAL_PP(value)[len] == '\0') || @@ -153,34 +131,44 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support array_init(&array); FOREACH_HASH_VAL(pos, Z_ARRVAL(ex_arr), entry) { + int ident_len; double quality; - char *selected, *identifier; + char *selected, *identifier, *freeme; const char *separator; #if HTTP_DBG_NEG fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry)); #endif - if (separator = strchr(Z_STRVAL_PP(entry), ';')) { + if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) { const char *ptr = separator; - while (*++ptr && !isdigit(*ptr)); + while (*++ptr && !isdigit(*ptr) && '.' != *ptr); quality = atof(ptr); - identifier = estrndup(Z_STRVAL_PP(entry), separator - Z_STRVAL_PP(entry)); + identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry)); } else { quality = 1000.0 - i++; - identifier = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)); + identifier = estrndup(Z_STRVAL_PP(entry), ident_len = Z_STRLEN_PP(entry)); + } + freeme = identifier; + + while (isspace(*identifier)) { + ++identifier; + --ident_len; + } + while (ident_len && isspace(identifier[ident_len - 1])) { + identifier[--ident_len] = '\0'; } - if (selected = neg(identifier, &quality, supported TSRMLS_CC)) { + if ((selected = neg(identifier, &quality, supported TSRMLS_CC))) { /* don't overwrite previously set with higher quality */ if (!zend_hash_exists(Z_ARRVAL(array), selected, strlen(selected) + 1)) { add_assoc_double(&array, selected, quality); } } - efree(identifier); + efree(freeme); } result = Z_ARRVAL(array); @@ -351,10 +339,9 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header header_len = strlen(header) + 1; } line = header; - - while (header_len >= (size_t) (line - begin)) { + + if (header_len) do { int value_len = 0; - /* note: valgrind may choke on that -- should be safe though */ switch (*line++) { case ':': @@ -366,7 +353,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header case 0: --value_len; /* we don't have CR so value length is one char less */ case '\n': - if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) { + if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) { http_info i; /* response/request line */ @@ -423,7 +410,8 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header } break; } - } + } while (header_len > (size_t) (line - begin)); + return SUCCESS; } /* }}} */ @@ -438,7 +426,9 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre HashPosition pos; Z_ARRVAL(array) = headers; - +#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)) { FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) { if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) { @@ -474,27 +464,19 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre /* {{{ 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) { - char *name, *key = NULL; - ulong idx; + char *name; + uint name_len = strlen(header); zend_bool result = 0; HashTable headers; - HashPosition pos; + zval **data; - name = pretty_key(estrdup(header), strlen(header), 1, 1); + 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); - FOREACH_HASH_KEY(pos, &headers, key, idx) { - if (key && (!strcmp(key, name))) { - zval **data; - - if (SUCCESS == zend_hash_get_current_data_ex(&headers, (void **) &data, &pos)) { - result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1; - } - break; - } + 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; } - zend_hash_destroy(&headers); efree(name);