| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_http_api.h"
-static int php_http_negotiate_sort(const void *a, const void *b TSRMLS_DC)
+static int php_http_negotiate_sort(const void *first, const void *second TSRMLS_DC)
{
- zval result, *first, *second;
+ zval result;
+ Bucket *b1 = (Bucket *) first, *b2 = (Bucket *) second;
- first = *((zval **) (*((Bucket **) a))->pData);
- second= *((zval **) (*((Bucket **) b))->pData);
-
- if (numeric_compare_function(&result, first, second TSRMLS_CC) != SUCCESS) {
+ if (numeric_compare_function(&result, &b1->val, &b2->val)!= SUCCESS) {
return 0;
}
return (Z_LVAL(result) > 0 ? -1 : (Z_LVAL(result) < 0 ? 1 : 0));
}
-static int php_http_negotiate_reduce(void *p TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
+#define M_PRI 5
+#define M_SEC 2
+#define M_ANY 1
+#define M_NOT 0
+#define M_ALL ~0
+static inline unsigned php_http_negotiate_match(const char *param_str, size_t param_len, const char *supported_str, size_t supported_len, const char *sep_str, size_t sep_len)
+{
+ unsigned match = M_NOT;
+
+ if (param_len == supported_len && !strncasecmp(param_str, supported_str, param_len)) {
+ /* that was easy */
+ match = M_ALL;
+ } else if (sep_str && sep_len) {
+ const char *param_sec = php_http_locate_str(param_str, param_len, sep_str, sep_len);
+ size_t param_pri_len = param_sec ? param_sec - param_str : param_len;
+ const char *supported_sec = php_http_locate_str(supported_str, supported_len, sep_str, sep_len);
+ size_t supported_pri_len = supported_sec ? supported_sec - supported_str : supported_len;
+ size_t cmp_len = MIN(param_pri_len, supported_pri_len);
+
+ if (((*param_str == '*') || (*supported_str == '*'))
+ || ((param_pri_len == supported_pri_len) && !strncasecmp(param_str, supported_str, param_pri_len))
+ || ((!param_sec || !supported_sec) && cmp_len && !strncasecmp(param_str, supported_str, cmp_len))
+ ) {
+ match += M_PRI;
+ }
+
+ if (param_sec && supported_sec && !strcasecmp(param_sec, supported_sec)) {
+ match += M_SEC;
+ }
+
+ if ((param_sec && *(param_sec + sep_len) == '*')
+ || (supported_sec && *(supported_sec + sep_len) == '*')
+ || ((*param_str == '*') || (*supported_str == '*'))
+ ) {
+ match += M_ANY;
+ }
+ }
+#if 0
+ fprintf(stderr, "match: %s == %s => %u\n", supported_str, param_str, match);
+#endif
+ return match;
+}
+static int php_http_negotiate_reduce(zval *p, int num_args, va_list args, zend_hash_key *hash_key)
{
- char *tmp;
- zval **q, *supported = php_http_ztyp(IS_STRING, *(zval **)p);
+ unsigned best_match = 0;
+ php_http_arrkey_t key;
+ zval *value, *q = NULL;
+ zend_string *supported = zval_get_string(p);
HashTable *params = va_arg(args, HashTable *);
HashTable *result = va_arg(args, HashTable *);
+ const char *sep_str = va_arg(args, const char *);
+ size_t sep_len = va_arg(args, size_t);
+
+ ZEND_HASH_FOREACH_KEY_VAL(params, key.h, key.key, value)
+ {
+ unsigned match;
- tmp = php_strtolower(estrndup(Z_STRVAL_P(supported), Z_STRLEN_P(supported)), Z_STRLEN_P(supported));
- if (SUCCESS == zend_symtable_find(params, tmp, Z_STRLEN_P(supported) + 1, (void *) &q)) {
- Z_ADDREF_PP(q);
- zend_symtable_update(result, Z_STRVAL_P(supported), Z_STRLEN_P(supported) + 1, (void *) q, sizeof(zval *), NULL);
+ php_http_arrkey_stringify(&key, NULL);
+ match = php_http_negotiate_match(key.key->val, key.key->len, supported->val, supported->len, sep_str, sep_len);
+
+ if (match > best_match) {
+ best_match = match;
+ q = value;
+ }
+ php_http_arrkey_dtor(&key);
}
- efree(tmp);
- zval_ptr_dtor(&supported);
+ ZEND_HASH_FOREACH_END();
+
+ if (q && Z_DVAL_P(q) > 0) {
+ Z_TRY_ADDREF_P(q);
+ zend_hash_update(result, supported, q);
+ }
+
+ zend_string_release(supported);
return ZEND_HASH_APPLY_KEEP;
}
-PHP_HTTP_API HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len TSRMLS_DC)
+HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len TSRMLS_DC)
{
HashTable *result = NULL;
if (value_str && value_len) {
unsigned i = 0;
- zval arr, **val, **arg, **zq;
- HashPosition pos;
+ zval arr, *val, *arg, *zq;
HashTable params;
- php_http_array_hashkey_t key = php_http_array_hashkey_init(1);
+ php_http_arrkey_t key;
php_http_params_opts_t opts;
zend_hash_init(¶ms, 10, NULL, ZVAL_PTR_DTOR, 0);
php_http_params_parse(¶ms, &opts TSRMLS_CC);
efree(opts.input.str);
- INIT_PZVAL(&arr);
array_init(&arr);
- FOREACH_HASH_KEYVAL(pos, ¶ms, key, val) {
+ ZEND_HASH_FOREACH_KEY_VAL(¶ms, key.h, key.key, val)
+ {
double q;
- if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(val), ZEND_STRS("arguments"), (void *) &arg)
- && IS_ARRAY == Z_TYPE_PP(arg)
- && SUCCESS == zend_hash_find(Z_ARRVAL_PP(arg), ZEND_STRS("q"), (void *) &zq)) {
- zval *tmp = php_http_ztyp(IS_DOUBLE, *zq);
-
- q = Z_DVAL_P(tmp);
- zval_ptr_dtor(&tmp);
-
- if (!q) {
- STR_FREE(key.str);
- continue;
- }
+ if ((arg = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("arguments")))
+ && (IS_ARRAY == Z_TYPE_P(arg))
+ && (zq = zend_hash_str_find(Z_ARRVAL_P(arg), ZEND_STRL("q")))) {
+ q = zval_get_double(zq);
} else {
q = 1.0 - ++i / 100.0;
}
- if (key.type == HASH_KEY_IS_STRING) {
- const char *ptr;
+#if 0
+ fprintf(stderr, "Q: %s=%1.3f\n", key.key->val, q);
+#endif
- php_strtolower(key.str, key.len - 1);
- add_assoc_double_ex(&arr, key.str, key.len, q);
-
- if (primary_sep_str && primary_sep_len && (ptr = php_http_locate_str(key.str, key.len - 1, primary_sep_str, primary_sep_len))) {
- key.str[ptr - key.str] = '\0';
- add_assoc_double_ex(&arr, key.str, ptr - key.str + 1, q - i / 1000.0);
- }
+ if (key.key) {
+ add_assoc_double_ex(&arr, key.key->val, key.key->len, q);
} else {
- add_index_double(&arr, key.num, q);
+ add_index_double(&arr, key.h, q);
}
- STR_FREE(key.str);
}
+ ZEND_HASH_FOREACH_END();
+
+#if 0
+ zend_print_zval_r(&arr, 1);
+#endif
ALLOC_HASHTABLE(result);
zend_hash_init(result, zend_hash_num_elements(supported), NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_apply_with_arguments(supported TSRMLS_CC, php_http_negotiate_reduce, 2, Z_ARRVAL(arr), result);
+ zend_hash_apply_with_arguments(supported, php_http_negotiate_reduce, 4, Z_ARRVAL(arr), result, primary_sep_str, primary_sep_len);
zend_hash_destroy(¶ms);
zval_dtor(&arr);
- zend_hash_sort(result, zend_qsort, php_http_negotiate_sort, 0 TSRMLS_CC);
+ zend_hash_sort(result, php_http_negotiate_sort, 0);
}
return result;
projects / m6w6 / ext-http / blobdiff