X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=8a4ecc5591f8d9a9ee8c2b4e918a755c56facd4d;hp=11815f25a835a81112da1a08c6aad73628cbf063;hb=5dca59e3a269c903b395d97abe831c0fc138b5b6;hpb=b08947e98f1832091c8a9f6dea3799e0524d2822

diff --git a/http_headers_api.c b/http_headers_api.c
index 11815f2..8a4ecc5 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -27,11 +27,16 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_headers_api.h"
+#include "php_http_info_api.h"
 
 #include <ctype.h>
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
+#ifndef HTTP_DBG_NEG
+#	define HTTP_DBG_NEG 0
+#endif
+
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 {
@@ -51,55 +56,129 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ char *http_negotiate_q(char *, HashTable *, char *) */
-PHP_HTTP_API char *_http_negotiate_q(const char *entry, const HashTable *supported,	const char *def TSRMLS_DC)
+/* {{{ char *http_negotiate_language_func */
+char *_http_negotiate_language_func(const char *test, double *quality, HashTable *supported TSRMLS_DC)
 {
-	zval *zaccept, zdelim, zarray, zentries, **zentry, **zsupp;
-	char *q_ptr = NULL, *key = NULL;
-	int i = 0;
-	ulong idx = 0;
-	double qual;
-
-	HTTP_GSC(zaccept, entry, estrdup(def));
-
-	array_init(&zarray);
-	array_init(&zentries);
-
-	Z_STRVAL(zdelim) = ",";
-	Z_STRLEN(zdelim) = 1;
-
-	php_explode(&zdelim, zaccept, &zarray, -1);
-
-	FOREACH_HASH_VAL(Z_ARRVAL(zarray), zentry) {
-		if (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';')) {
-			qual = strtod(q_ptr + 3, NULL);
-			*q_ptr = 0;
-			q_ptr = NULL;
-		} else {
-			qual = 1000.0 - i++;
+	zval **value;
+	const char *dash_test;
+	
+	FOREACH_HASH_VAL(supported, value) {
+#if HTTP_DBG_NEG
+		fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test);
+#endif
+		if (!strcasecmp(Z_STRVAL_PP(value), test)) {
+			return Z_STRVAL_PP(value);
 		}
-		/* TODO: support primaries only, too */
-		FOREACH_HASH_VAL((HashTable *)supported, zsupp) {
-			if (!strcasecmp(Z_STRVAL_PP(zsupp), Z_STRVAL_PP(zentry))) {
-				add_assoc_double(&zentries, Z_STRVAL_PP(zsupp), qual);
-				break;
+	}
+	
+	/* no distinct match found, so try primaries */
+	if (dash_test = strchr(test, '-')) {
+		FOREACH_HASH_VAL(supported, value) {
+			int len = dash_test - test;
+#if HTTP_DBG_NEG
+			fprintf(stderr, "strncascmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len);
+#endif
+			if (	(!strncasecmp(Z_STRVAL_PP(value), test, len)) &&
+					(	(Z_STRVAL_PP(value)[len] == '\0') || 
+						(Z_STRVAL_PP(value)[len] == '-'))) {
+				*quality /= 2;
+				return Z_STRVAL_PP(value);
 			}
 		}
 	}
-	zval_dtor(&zarray);
-
-	zend_hash_sort(Z_ARRVAL(zentries), zend_qsort, http_sort_q, 0 TSRMLS_CC);
+	
+	return NULL;
+}
+/* }}} */
 
-	FOREACH_HASH_KEY(Z_ARRVAL(zentries), key, idx) {
-		if (key) {
-			key = estrdup(key);
-			zval_dtor(&zentries);
-			return key;
+/* {{{ char *http_negotiate_charset_func */
+char *_http_negotiate_charset_func(const char *test, double *quality, HashTable *supported TSRMLS_DC)
+{
+	zval **value;
+	
+	FOREACH_HASH_VAL(supported, value) {
+#if HTTP_DBG_NEG
+		fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test);
+#endif
+		if (!strcasecmp(Z_STRVAL_PP(value), test)) {
+			return Z_STRVAL_PP(value);
 		}
 	}
-	zval_dtor(&zentries);
+	
+	return NULL;
+}
+/* }}} */
 
-	return estrdup(def);
+/* {{{ HashTable *http_negotiate_q(const char *, HashTable *, negotiate_func_t) */
+PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC)
+{
+	zval *accept;
+	HashTable *result = NULL;
+	
+#if HTTP_DBG_NEG
+	fprintf(stderr, "Reading header %s: ", header);
+#endif
+	HTTP_GSC(accept, header, NULL);
+#if HTTP_DBG_NEG
+	fprintf(stderr, "%s\n", Z_STRVAL_P(accept));
+#endif
+	
+	if (Z_STRLEN_P(accept)) {
+		zval ex_arr, ex_del;
+		
+		INIT_PZVAL(&ex_del);
+		INIT_PZVAL(&ex_arr);
+		ZVAL_STRINGL(&ex_del, ",", 1, 0);
+		array_init(&ex_arr);
+		
+		php_explode(&ex_del, accept, &ex_arr, -1);
+		
+		if (zend_hash_num_elements(Z_ARRVAL(ex_arr)) > 0) {
+			int i = 0;
+			zval **entry, array;
+			
+			INIT_PZVAL(&array);
+			array_init(&array);
+			
+			FOREACH_HASH_VAL(Z_ARRVAL(ex_arr), entry) {
+				double quality;
+				char *selected, *identifier;
+				const char *separator;
+				
+#if HTTP_DBG_NEG
+				fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry));
+#endif
+				
+				if (separator = strchr(Z_STRVAL_PP(entry), ';')) {
+					const char *ptr = separator;
+					
+					while (*++ptr && !isdigit(*ptr));
+					
+					quality = strtod(ptr, NULL);
+					identifier = estrndup(Z_STRVAL_PP(entry), separator - Z_STRVAL_PP(entry));
+				} else {
+					quality = 1000.0 - i++;
+					identifier = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+				}
+				
+				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);
+					}
+				}
+				
+				efree(identifier);
+			}
+			
+			result = Z_ARRVAL(array);
+			zend_hash_sort(result, zend_qsort, http_sort_q, 0 TSRMLS_CC);
+		}
+		
+		zval_dtor(&ex_arr);
+	}
+	
+	return result;
 }
 /* }}} */
 
@@ -124,7 +203,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 		switch (c = *(range++))
 		{
 			case '0':
-				*ptr *= 10;
+				/* allow 000... - shall we? */
+				if (*ptr != -10) {
+					*ptr *= 10;
+				}
 			break;
 
 			case '1': case '2': case '3':
@@ -241,46 +323,47 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 /* }}} */
 
 /* {{{ STATUS http_parse_headers(char *, HashTable *, zend_bool) */
-PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, http_parse_headers_callback_t func, void **callback_data TSRMLS_DC)
+PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, 
+	http_info_callback callback_func, void **callback_data TSRMLS_DC)
 {
-	const char *colon = NULL, *line = NULL, *begin = header, *crlfcrlf = NULL;
+	const char *colon = NULL, *line = NULL, *begin = header;
+	const char *body = http_locate_body(header);
 	size_t header_len;
 	zval array;
 
-	Z_ARRVAL(array) = headers;
-
-	if (crlfcrlf = strstr(header, HTTP_CRLF HTTP_CRLF)) {
-		header_len = crlfcrlf - header + lenof(HTTP_CRLF);
+	INIT_ZARR(array, headers);
+	
+	if (body) {
+		header_len = body - header;
 	} else {
 		header_len = strlen(header) + 1;
 	}
-
-
-	if (header_len < 2 || !strchr(header, ':')) {
-		http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Cannot parse too short or malformed HTTP headers");
-		return FAILURE;
-	}
-
 	line = header;
 
 	while (header_len >= (size_t) (line - begin)) {
 		int value_len = 0;
-
+		/* note: valgrind may choke on that -- should be safe though */
 		switch (*line++)
 		{
+			case ':':
+				if (!colon) {
+					colon = line - 1;
+				}
+			break;
+			
 			case 0:
 				--value_len; /* we don't have CR so value length is one char less */
 			case '\n':
 				if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
+					http_info i;
+					
 					/* response/request line */
-                    if (    (!strncmp(header, "HTTP/1.", lenof("HTTP/1."))) ||
-                            (!strncmp(line - lenof("HTTP/1.x" HTTP_CRLF) + value_len, "HTTP/1.", lenof("HTTP/1.")))) {
-						if (func) {
-							func(header, &headers, callback_data TSRMLS_CC);
-							Z_ARRVAL(array) = headers;
-						}
+					if (SUCCESS == http_info_parse(header, &i)) {
+						callback_func(callback_data, &headers, &i TSRMLS_CC);
+						http_info_dtor(&i);
+						Z_ARRVAL(array) = headers;
 					} else
-
+					
 					/* "header: value" pair */
 					if (colon) {
 
@@ -327,68 +410,35 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 					header += line - header;
 				}
 			break;
-
-			case ':':
-				if (!colon) {
-					colon = line - 1;
-				}
-			break;
 		}
 	}
 	return SUCCESS;
 }
 /* }}} */
 
-PHP_HTTP_API void _http_parse_headers_default_callback(const char *http_line, HashTable **headers, void **cb_data TSRMLS_DC)
-{
-	zval array;
-	char *crlf = NULL;
-	size_t line_length;
-	Z_ARRVAL(array) = *headers;
-
-	if (crlf = strstr(http_line, HTTP_CRLF)) {
-		line_length = crlf - http_line;
-	} else {
-		line_length = strlen(http_line);
-	}
-
-	/* response */
-	if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
-		char *status = estrndup(http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x "));
-		add_assoc_stringl(&array, "Response Status", status, line_length - lenof("HTTP/1.x "), 0);
-	} else
-	/* request */
-	if (!strncmp(http_line + line_length - lenof("HTTP/1.x"), "HTTP/1.", lenof("HTTP/1."))) {
-		char *sep = strchr(http_line, ' ');
-		char *url = estrndup(sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1);
-		char *met = estrndup(http_line, sep - http_line);
-
-		add_assoc_stringl(&array, "Request Method", met, sep - http_line, 0);
-		add_assoc_stringl(&array, "Request Uri", url, strstr(sep, "HTTP/1.") - sep + 1 + 1, 0);
-	}
-}
-
 /* {{{ 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)
 {
 	char *key = NULL;
 	ulong idx = 0;
-	zval array;
+	zval array, **hsv;
 
 	Z_ARRVAL(array) = headers;
 
-	FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) {
-		if (key && !strncmp(key, "HTTP_", 5)) {
-			zval **header;
-
-			key += 5;
-			if (prettify) {
-				key = pretty_key(key, strlen(key), 1, 1);
+	if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) {
+		FOREACH_KEY(*hsv, key, idx) {
+			if (key && !strncmp(key, "HTTP_", 5)) {
+				zval **header;
+	
+				key += 5;
+				if (prettify) {
+					key = pretty_key(key, strlen(key), 1, 1);
+				}
+	
+				zend_hash_get_current_data(Z_ARRVAL_PP(hsv), (void **) &header);
+				add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+				key = NULL;
 			}
-
-			zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header);
-			add_assoc_stringl(&array, key, Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
-			key = NULL;
 		}
 	}
 }