X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_negotiate.c;h=ede406f9c2a96718801c8199f67a0426ce99cc4b;hp=5b9fe5f9bbc8b399667543296196a36d9e889769;hb=6116c2d8303b5301d927083af4dc763f952ab3ea;hpb=03f11ce599fa5a89148d588caf6ccec7f939e9d4

diff --git a/php_http_negotiate.c b/php_http_negotiate.c
index 5b9fe5f..ede406f 100644
--- a/php_http_negotiate.c
+++ b/php_http_negotiate.c
@@ -27,10 +27,10 @@ static int php_http_negotiate_sort(const void *first, const void *second TSRMLS_
 #define M_SEC 2
 #define M_ANY 1
 #define M_NOT 0
-#define M_ALL -1
+#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)
 {
-	int match = M_NOT;
+	unsigned match = M_NOT;
 
 	if (param_len == supported_len && !strncasecmp(param_str, supported_str, param_len)) {
 		/* that was easy */
@@ -92,6 +92,7 @@ static int php_http_negotiate_reduce(zval *p, int num_args, va_list args, zend_h
 	ZEND_HASH_FOREACH_END();
 
 	if (q && Z_DVAL_P(q) > 0) {
+		Z_TRY_ADDREF_P(q);
 		zend_hash_update(result, supported, q);
 	}
 
@@ -131,6 +132,10 @@ HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable
 				q = 1.0 - ++i / 100.0;
 			}
 
+#if 0
+			fprintf(stderr, "Q: %s=%1.3f\n", key.key->val, q);
+#endif
+
 			if (key.key) {
 				add_assoc_double_ex(&arr, key.key->val, key.key->len, q);
 			} else {
@@ -149,7 +154,7 @@ HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable
 		zend_hash_apply_with_arguments(supported, php_http_negotiate_reduce, 4, Z_ARRVAL(arr), result, primary_sep_str, primary_sep_len);
 		zend_hash_destroy(&params);
 		zval_dtor(&arr);
-		zend_hash_sort(result, zend_qsort, php_http_negotiate_sort, 0);
+		zend_hash_sort(result, php_http_negotiate_sort, 0);
 	}
 	
 	return result;