X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=c4d23c8a17824d1d172d88a033f74f4769dbf106;hp=b61646d34c4ac84cd7965d651fe6149f49fe8393;hb=92f5e5a5df0bff3d8076c1f5ed73590b40849501;hpb=64f9c50ce4d7f7ecc5b414b46fe44c28bf54974d

diff --git a/http_headers_api.c b/http_headers_api.c
index b61646d..c4d23c8 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -82,7 +82,7 @@ char *_http_negotiate_language_func(const char *test, double *quality, HashTable
 	}
 	
 	/* no distinct match found, so try primaries */
-	if (dash_test = strchr(test, '-')) {
+	if ((dash_test = strchr(test, '-'))) {
 		FOREACH_HASH_VAL(pos, supported, value) {
 			int len = dash_test - test;
 #if HTTP_DBG_NEG
@@ -161,7 +161,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 				fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry));
 #endif
 				
-				if (separator = strchr(Z_STRVAL_PP(entry), ';')) {
+				if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) {
 					const char *ptr = separator;
 					
 					while (*++ptr && !isdigit(*ptr));
@@ -173,7 +173,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 					identifier = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
 				}
 				
-				if (selected = neg(identifier, &quality, supported TSRMLS_CC)) {
+				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);
@@ -474,27 +474,19 @@ PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool pre
 /* {{{ 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)
 {
-	char *name, *key = NULL;
-	ulong idx;
+	char *name;
+	uint name_len = strlen(header);
 	zend_bool result = 0;
 	HashTable headers;
-	HashPosition pos;
+	zval **data;
 
-	name = pretty_key(estrdup(header), strlen(header), 1, 1);
+	name = pretty_key(estrndup(header, name_len), name_len, 1, 1);
 	zend_hash_init(&headers, 0, NULL, ZVAL_PTR_DTOR, 0);
 	http_get_request_headers_ex(&headers, 1);
 
-	FOREACH_HASH_KEY(pos, &headers, key, idx) {
-		if (key && (!strcmp(key, name))) {
-			zval **data;
-
-			if (SUCCESS == zend_hash_get_current_data_ex(&headers, (void **) &data, &pos)) {
-				result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
-			}
-			break;
-		}
+	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);
 	efree(name);