X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=http_headers_api.c;h=c778662f5f2029cd36760c883e7fd98512882bc2;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hp=c4d23c8a17824d1d172d88a033f74f4769dbf106;hpb=a0bca521b491711e43aef74fe19c23a8eb4d0777;p=m6w6%2Fext-http diff --git a/http_headers_api.c b/http_headers_api.c index c4d23c8..c778662 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) { @@ -86,7 +64,7 @@ char *_http_negotiate_language_func(const char *test, double *quality, HashTable 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,8 +131,9 @@ 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 @@ -164,13 +143,22 @@ 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)); + 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))) { @@ -180,7 +168,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support } } - 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 */ @@ -405,7 +392,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header } /* if we already have got such a header make an array of those */ - if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void **) &previous)) { + if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void *) &previous)) { /* convert to array */ if (Z_TYPE_PP(previous) != IS_ARRAY) { convert_to_array(*previous); @@ -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,8 +426,10 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre HashPosition pos; Z_ARRVAL(array) = headers; - - if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) { +#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)) { zval **header, *orig; @@ -450,7 +440,7 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre key = pretty_key(estrndup(key, keylen), keylen, 1, 1); } - zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void **) &header, &pos); + zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos); orig = *header; convert_to_string_ex(header); @@ -484,7 +474,7 @@ PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c 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)) { + 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);