X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=ef5099f8681a899421e17c6229a0ed052a2b1cfe;hp=ce5f0518be22112252b5d91ae2da8ee92ceef8ac;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=2f39230d83bdf816dcae52c7e5a1b019347f0e7b

diff --git a/http_headers_api.c b/http_headers_api.c
index ce5f051..ef5099f 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -143,7 +143,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 				if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) {
 					const char *ptr = separator;
 					
-					while (*++ptr && !isdigit(*ptr) && '.' != *ptr);
+					while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr);
 					
 					quality = atof(ptr);
 					identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
@@ -153,11 +153,11 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 				}
 				freeme = identifier;
 				
-				while (isspace(*identifier)) {
+				while (HTTP_IS_CTYPE(space, *identifier)) {
 					++identifier;
 					--ident_len;
 				}
-				while (ident_len && isspace(identifier[ident_len - 1])) {
+				while (ident_len && HTTP_IS_CTYPE(space, identifier[ident_len - 1])) {
 					identifier[--ident_len] = '\0';
 				}
 				
@@ -326,7 +326,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 	INIT_ZARR(array, headers);
 	
 	/* skip leading ws */
-	while (isspace(*header)) ++header;
+	while (HTTP_IS_CTYPE(space, *header)) ++header;
 	line = header;
 	
 #define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r')))
@@ -358,9 +358,9 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 							const char *key = header;
 							
 							/* skip leading ws */
-							while (keylen && isspace(*key)) --keylen && ++key;
+							while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key;
 							/* skip trailing ws */
-							while (keylen && isspace(key[keylen - 1])) --keylen;
+							while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen;
 							
 							if (keylen > 0) {
 								zval **previous = NULL;
@@ -374,9 +374,9 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 								value_len += line - colon - 1;
 								
 								/* skip leading ws */
-								while (isspace(*(++colon))) --value_len;
+								while (HTTP_IS_CTYPE(space, *(++colon))) --value_len;
 								/* skip trailing ws */
-								while (isspace(colon[value_len - 1])) --value_len;
+								while (HTTP_IS_CTYPE(space, colon[value_len - 1])) --value_len;
 								
 								if (value_len > 0) {
 									value = estrndup(colon, value_len);
@@ -420,48 +420,40 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 }
 /* }}} */
 
-/* {{{ void http_get_request_headers_ex(HashTable *, zend_bool) */
-PHP_HTTP_API void _http_get_request_headers_ex(HashTable *headers, zend_bool prettify TSRMLS_DC)
+/* {{{ void http_get_request_headers(HashTable *) */
+PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
 {
-	char *key = NULL;
-	ulong idx = 0;
-	uint keylen = 0;
-	zval array, **hsv;
+	HashKey key = initHashKey(0);
+	zval **hsv, **header;
 	HashPosition pos;
-
-	Z_ARRVAL(array) = headers;
+	
+	if (!HTTP_G->request.headers) {
+		ALLOC_HASHTABLE(HTTP_G->request.headers);
+		zend_hash_init(HTTP_G->request.headers, 0, NULL, ZVAL_PTR_DTOR, 0);
+		
 #ifdef ZEND_ENGINE_2
-	zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+		zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
 #endif
-	if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) {
-		FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) {
-			if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) {
-				zval **header, *orig;
-	
-				key += 5;
-				keylen -= 6;
-				if (prettify) {
-					key = pretty_key(estrndup(key, keylen), keylen, 1, 1);
-				}
-	
-				zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
-				
-				orig = *header;
-				convert_to_string_ex(header);
-				add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
-				if (orig != *header) {
-					zval_ptr_dtor(header);
-				}
-				
-				if (prettify) {
-					efree(key);
+		
+		if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
+			FOREACH_KEY(pos, *hsv, key) {
+				if (key.type == HASH_KEY_IS_STRING && key.len > 6 && !strncmp(key.str, "HTTP_", 5)) {
+					key.len -= 5;
+					key.str = pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1);
+					
+					zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos);
+					ZVAL_ADDREF(*header);
+					zend_hash_add(HTTP_G->request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
+					
+					efree(key.str);
 				}
-				
-				key = NULL;
-				keylen = 0;
 			}
 		}
 	}
+	
+	if (headers) {
+		zend_hash_copy(headers, HTTP_G->request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+	}
 }
 /* }}} */
 
@@ -471,17 +463,15 @@ PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const c
 	char *name;
 	uint name_len = strlen(header);
 	zend_bool result = 0;
-	HashTable headers;
-	zval **data;
+	zval **data, *zvalue;
 
+	http_get_request_headers(NULL);
 	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);
-
-	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;
+	if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) {
+		zvalue = zval_copy(IS_STRING, *data);
+		result = (match_case ? strcmp(Z_STRVAL_P(zvalue), value) : strcasecmp(Z_STRVAL_P(zvalue), value)) ? 0 : 1;
+		zval_free(&zvalue);
 	}
-	zend_hash_destroy(&headers);
 	efree(name);
 
 	return result;