From: Michael Wallner Date: Wed, 9 Jun 2010 07:29:35 +0000 (+0000) Subject: * Added generic http_negotiate() function (FR#17338) X-Git-Tag: RELEASE_1_7_0~2 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=fbbde1fd8b8a92c923053a1cb21ba725d7ba5756 * Added generic http_negotiate() function (FR#17338) --- diff --git a/http.c b/http.c index a2ffaf9..76629d3 100644 --- a/http.c +++ b/http.c @@ -66,6 +66,7 @@ zend_function_entry http_functions[] = { PHP_FE(http_negotiate_language, http_arg_pass_ref_2) PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2) + PHP_FE(http_negotiate, http_arg_pass_ref_3) PHP_FE(http_redirect, NULL) PHP_FE(http_throttle, NULL) PHP_FE(http_send_status, NULL) diff --git a/http_functions.c b/http_functions.c index 0799969..bec1128 100644 --- a/http_functions.c +++ b/http_functions.c @@ -165,10 +165,23 @@ PHP_FUNCTION(http_build_str) RETVAL_NULL(); \ } \ } -#define HTTP_DO_NEGOTIATE(type, supported, rs_array) \ -{ \ - HashTable *result; \ - if ((result = http_negotiate_ ##type(supported))) { \ + +#define HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array) \ + HTTP_DO_NEGOTIATE_DEFAULT(supported); \ + if (rs_array) { \ + HashPosition pos; \ + zval **value_ptr; \ + \ + FOREACH_VAL(pos, supported, value_ptr) { \ + zval *value = http_zsep(IS_STRING, *value_ptr); \ + add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \ + zval_ptr_dtor(&value); \ + } \ + } + +#define HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array) \ + { \ + HashTable *result = rs; \ char *key; \ uint key_len; \ ulong idx; \ @@ -185,22 +198,17 @@ PHP_FUNCTION(http_build_str) \ zend_hash_destroy(result); \ FREE_HASHTABLE(result); \ - \ - } else { \ - HTTP_DO_NEGOTIATE_DEFAULT(supported); \ - \ - if (rs_array) { \ - HashPosition pos; \ - zval **value_ptr; \ - \ - FOREACH_VAL(pos, supported, value_ptr) { \ - zval *value = http_zsep(IS_STRING, *value_ptr); \ - add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \ - zval_ptr_dtor(&value); \ - } \ + } + +#define HTTP_DO_NEGOTIATE(type, supported, rs_array) \ + { \ + HashTable *result; \ + if ((result = http_negotiate_ ##type(supported))) { \ + HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array); \ + } else { \ + HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); \ } \ - } \ -} + } /* {{{ proto string http_negotiate_language(array supported[, array &result]) Negotiate the clients preferred language. */ @@ -259,6 +267,30 @@ PHP_FUNCTION(http_negotiate_content_type) } /* }}} */ +/* {{{ proto string http_negotiate(mixed value, array supported[, array &result]) + Negotiate the user supplied value. */ +PHP_FUNCTION(http_negotiate) +{ + zval *value, *supported, *rs_array = NULL; + HashTable *rs; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za|z", &value, &supported, &rs_array)) { + RETURN_FALSE; + } + + if (rs_array) { + zval_dtor(rs_array); + array_init(rs_array); + } + + if ((rs = http_negotiate_z(value, Z_ARRVAL_P(supported), http_negotiate_default_func))) { + HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array); + } else { + HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); + } +} +/* }}} */ + /* {{{ proto bool http_send_status(int status) Send HTTP status code. */ PHP_FUNCTION(http_send_status) diff --git a/http_headers_api.c b/http_headers_api.c index 7211304..3091b63 100644 --- a/http_headers_api.c +++ b/http_headers_api.c @@ -107,55 +107,45 @@ 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 - if (!(accept = http_get_server_var(header, 1))) { - return 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, 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 = zend_strtod(ptr, NULL); identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry)); } else { @@ -163,7 +153,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support identifier = estrndup(Z_STRVAL_PP(entry), ident_len = Z_STRLEN_PP(entry)); } freeme = identifier; - + while (HTTP_IS_CTYPE(space, *identifier)) { ++identifier; --ident_len; @@ -171,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) { diff --git a/package.xml b/package.xml index 2e3d7b6..652a161 100644 --- a/package.xml +++ b/package.xml @@ -39,6 +39,7 @@ support. Parallel requests are available for PHP 5 and greater. BSD, revised = 7.19.4) diff --git a/php_http.h b/php_http.h index 311c6d5..630ef82 100644 --- a/php_http.h +++ b/php_http.h @@ -198,6 +198,7 @@ PHP_FUNCTION(http_build_str); PHP_FUNCTION(http_negotiate_language); PHP_FUNCTION(http_negotiate_charset); PHP_FUNCTION(http_negotiate_content_type); +PHP_FUNCTION(http_negotiate); PHP_FUNCTION(http_redirect); PHP_FUNCTION(http_throttle); PHP_FUNCTION(http_send_status); diff --git a/php_http_headers_api.h b/php_http_headers_api.h index a4f382e..7f22e2a 100644 --- a/php_http_headers_api.h +++ b/php_http_headers_api.h @@ -48,6 +48,8 @@ extern char *_http_negotiate_default_func(const char *test, double *quality, Has #define http_negotiate_content_type_ex(supported) http_negotiate_q("HTTP_ACCEPT", (supported), http_negotiate_content_type_func) #define http_negotiate_q(e, s, n) _http_negotiate_q((e), (s), (n) TSRMLS_CC) PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC); +#define http_negotiate_z(z, s, n) _http_negotiate_z((z), (s), (n) TSRMLS_CC) +PHP_HTTP_API HashTable *_http_negotiate_z(zval *value, HashTable *supported, negotiate_func_t neg TSRMLS_DC); #define http_get_request_ranges(r, l) _http_get_request_ranges((r), (l) TSRMLS_CC) PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC);