X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=95fbdec82c17fa5efa6fd7e0ca7a95aec85c00f5;hp=7bbe8e921d4bef6d6b34b1e99239ca658e26f0a6;hb=04d5fbffa287ddb16b0c20ca8ea1bc34b3a6acfc;hpb=833996197be90565b5bf497aa28226ddf10fb575

diff --git a/http_headers_api.c b/http_headers_api.c
index 7bbe8e9..95fbdec 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -107,7 +107,9 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 #if HTTP_DBG_NEG
 	fprintf(stderr, "Reading header %s: ", header);
 #endif
-	HTTP_GSC(accept, header, NULL);
+	if (!(accept = http_get_server_var(header, 1))) {
+		return NULL;
+	}
 #if HTTP_DBG_NEG
 	fprintf(stderr, "%s\n", Z_STRVAL_P(accept));
 #endif
@@ -189,15 +191,12 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 	char *range, c;
 	long begin = -1, end = -1, *ptr;
 
-	HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO);
-	range = Z_STRVAL_P(zrange);
-
-	if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
+	if (	!(zrange = http_get_server_var("HTTP_RANGE", 1)) || 
+			Z_STRLEN_P(zrange) < lenof("bytes=") || strncmp(Z_STRVAL_P(zrange), "bytes=", lenof("bytes="))) {
 		return RANGE_NO;
 	}
-
+	range = Z_STRVAL_P(zrange) + lenof("bytes=");
 	ptr = &begin;
-	range += sizeof("bytes=") - 1;
 
 	do {
 		switch (c = *(range++)) {
@@ -358,7 +357,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 							const char *key = header;
 							
 							/* skip leading ws */
-							while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen && ++key;
+							while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key;
 							/* skip trailing ws */
 							while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen;
 							
@@ -423,9 +422,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 /* {{{ 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;
+	HashKey key = initHashKey(0);
 	zval **hsv, **header;
 	HashPosition pos;
 	
@@ -438,17 +435,16 @@ PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC)
 #endif
 		
 		if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) {
-			FOREACH_KEYLEN(pos, *hsv, key, keylen, idx) {
-				if (key && keylen > 6 && !strncmp(key, "HTTP_", 5)) {
-					keylen -= 6;
-					key = pretty_key(estrndup(key + 5, keylen), keylen, 1, 1);
+			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, keylen + 1, (void *) header, sizeof(zval *), NULL);
+					zend_hash_add(HTTP_G->request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL);
 					
-					STR_SET(key, NULL)
-					keylen = 0;
+					efree(key.str);
 				}
 			}
 		}
@@ -466,13 +462,14 @@ 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;
-	zval **data;
+	zval **data, *zvalue;
 
 	http_get_request_headers(NULL);
 	name = pretty_key(estrndup(header, name_len), name_len, 1, 1);
 	if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) {
-		convert_to_string_ex(data);
-		result = (match_case ? strcmp(Z_STRVAL_PP(data), value) : strcasecmp(Z_STRVAL_PP(data), value)) ? 0 : 1;
+		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);
 	}
 	efree(name);