X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=7d824525602ae4f45451392702fef9eb17b3f276;hp=cc4e60974e3f7b0c3ff5760569ba4b78077a5e85;hb=4f5d70d375dac27459a80c1e5271697c1f46c675;hpb=96b6d481cfa03fae8c40a6ab7c2156036b082d7d

diff --git a/http_headers_api.c b/http_headers_api.c
index cc4e609..7d82452 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -111,7 +111,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 	range = Z_STRVAL_P(zrange);
 
 	if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
-		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
+		http_error(E_NOTICE, HTTP_E_HEADER, "Range header misses bytes=");
 		return RANGE_NO;
 	}
 
@@ -238,17 +238,24 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
 }
 /* }}} */
 
-/* {{{ STATUS http_parse_headers(char *, size_t, HashTable *, zend_bool) */
-PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
-	HashTable *headers, zend_bool prettify,
-	http_parse_headers_callback_t func, void **callback_data TSRMLS_DC)
+/* {{{ 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)
 {
-	char *colon = NULL, *line = NULL, *begin = header;
+	const char *colon = NULL, *line = NULL, *begin = header, *crlfcrlf = NULL;
+	size_t header_len;
 	zval array;
 
 	Z_ARRVAL(array) = headers;
 
-	if (header_len < 2) {
+	if (crlfcrlf = strstr(header, HTTP_CRLF HTTP_CRLF)) {
+		header_len = crlfcrlf - header + lenof(HTTP_CRLF);
+	} else {
+		header_len = strlen(header) + 1;
+	}
+
+
+	if (header_len < 2 || !strchr(header, ':')) {
+		http_error(E_WARNING, HTTP_E_PARSE, "Cannot parse too short or malformed HTTP headers");
 		return FAILURE;
 	}
 
@@ -264,10 +271,10 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
 			case '\n':
 				if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
 					/* response/request line */
-					if (	(!strncmp(header, "HTTP/1.", lenof("HTTP/1."))) ||
-							(!strncmp(line - lenof("HTTP/1.x\r") + value_len, "HTTP/1.", lenof("HTTP/1.")))) {
+                    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(callback_data, header, line - header + value_len, &headers TSRMLS_CC);
+							func(header, &headers, callback_data TSRMLS_CC);
 							Z_ARRVAL(array) = headers;
 						}
 					} else
@@ -302,21 +309,11 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
 
 							/* if we already have got such a header make an array of those */
 							if (SUCCESS == zend_hash_find(headers, key, keylen + 1, (void **) &previous)) {
-								/* already an array? - just add */
-								if (Z_TYPE_PP(previous) == IS_ARRAY) {
-										add_next_index_stringl(*previous, value, value_len, 0);
-								} else {
-									/* create the array */
-									zval *new_array;
-									MAKE_STD_ZVAL(new_array);
-									array_init(new_array);
-
-									add_next_index_stringl(new_array, Z_STRVAL_PP(previous), Z_STRLEN_PP(previous), 1);
-									add_next_index_stringl(new_array, value, value_len, 0);
-									add_assoc_zval(&array, key, new_array);
+								/* convert to array */
+								if (Z_TYPE_PP(previous) != IS_ARRAY) {
+									convert_to_array(*previous);
 								}
-
-								previous = NULL;
+								add_next_index_stringl(*previous, value, value_len, 0);
 							} else {
 								add_assoc_stringl(&array, key, value, value_len, 0);
 							}
@@ -340,21 +337,32 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(char *header, size_t header_len,
 }
 /* }}} */
 
-PHP_HTTP_API void _http_parse_headers_default_callback(void **cb_data, char *http_line, size_t line_length, HashTable **headers TSRMLS_DC)
+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."))) {
-		add_assoc_stringl(&array, "Response Status", http_line + lenof("HTTP/1.x "), line_length - lenof("HTTP/1.x \r\n"), 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\r\n"), "HTTP/1.", lenof("HTTP/1."))) {
+	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", http_line, sep - http_line, 1);
-		add_assoc_stringl(&array, "Request Uri", sep + 1, strstr(sep, "HTTP/1.") - sep + 1 + 1, 1);
+		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);
 	}
 }