X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=3091b63b227ef1f692fb23f02a79e86d43bbaa8a;hp=ef5099f8681a899421e17c6229a0ed052a2b1cfe;hb=refs%2Fheads%2Fv1.7.x;hpb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d diff --git a/http_headers_api.c b/http_headers_api.c index ef5099f..3091b63 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) { @@ -98,61 +107,53 @@ char *_http_negotiate_default_func(const char *test, double *quality, HashTable } /* }}} */ -/* {{{ HashTable *http_negotiate_q(const char *, HashTable *, negotiate_func_t) */ -PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC) +/* {{{ HashTable *http_negotiate_z(zval *, HashTable *, negotiate_func_t) */ +PHP_HTTP_API HashTable *_http_negotiate_z(zval *value, HashTable *supported, negotiate_func_t neg TSRMLS_DC) { - zval *accept; + zval *accept = http_zsep(IS_STRING, value); HashTable *result = NULL; - -#if HTTP_DBG_NEG - fprintf(stderr, "Reading header %s: ", header); -#endif - HTTP_GSC(accept, header, NULL); -#if HTTP_DBG_NEG - fprintf(stderr, "%s\n", Z_STRVAL_P(accept)); -#endif - + if (Z_STRLEN_P(accept)) { zval ex_arr, ex_del; - + INIT_PZVAL(&ex_del); INIT_PZVAL(&ex_arr); 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; HashPosition pos; zval **entry, array; - + INIT_PZVAL(&array); array_init(&array); - + FOREACH_HASH_VAL(pos, Z_ARRVAL(ex_arr), entry) { int ident_len; double quality; 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), ';'))) { const char *ptr = separator; - + 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++; identifier = estrndup(Z_STRVAL_PP(entry), ident_len = Z_STRLEN_PP(entry)); } freeme = identifier; - + while (HTTP_IS_CTYPE(space, *identifier)) { ++identifier; --ident_len; @@ -160,28 +161,49 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support while (ident_len && HTTP_IS_CTYPE(space, identifier[ident_len - 1])) { identifier[--ident_len] = '\0'; } - + 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(freeme); } - + result = Z_ARRVAL(array); zend_hash_sort(result, zend_qsort, http_sort_q, 0 TSRMLS_CC); } - + zval_dtor(&ex_arr); } - + + zval_ptr_dtor(&accept); + return result; } /* }}} */ +/* {{{ HashTable *http_negotiate_q(const char *, HashTable *, negotiate_func_t) */ +PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC) +{ + zval *accept; + +#if HTTP_DBG_NEG + fprintf(stderr, "Reading header %s: ", header); +#endif + if (!(accept = http_get_server_var(header, 1))) { + return NULL; + } +#if HTTP_DBG_NEG + fprintf(stderr, "%s\n", Z_STRVAL_P(accept)); +#endif + + return http_negotiate_z(accept, supported, neg); +} +/* }}} */ + /* {{{ http_range_status http_get_request_ranges(HashTable *ranges, size_t) */ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC) { @@ -189,15 +211,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 +264,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; @@ -457,6 +484,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) { @@ -468,9 +512,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);