From: Michael Wallner <mike@php.net>
Date: Mon, 10 Oct 2005 08:01:55 +0000 (+0000)
Subject: - fix parsing messages with Content-Range header
X-Git-Tag: RELEASE_0_15_0~17
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b5ea2548f9717e8d0f26de29bdce6881623b67a3;p=m6w6%2Fext-http

- fix parsing messages with Content-Range header
- add test
---

diff --git a/http_message_api.c b/http_message_api.c
index be4d0c3..20fc791 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -157,19 +157,19 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 
 			/* decode and replace Transfer-Encoding with Content-Length header */
 			if (continue_at = http_chunked_decode(body, message + message_length - body, &decoded, &decoded_len)) {
-				phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
-				efree(decoded);
-				{
-					zval *len;
-					char *tmp;
+				zval *len;
+				char *tmp;
+				int tmp_len;
 
-					spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
-					MAKE_STD_ZVAL(len);
-					ZVAL_STRING(len, tmp, 0);
+				tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
+				MAKE_STD_ZVAL(len);
+				ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
-					zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
-					zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
-				}
+				zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
+				zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL);
+				
+				phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len);
+				efree(decoded);
 			}
 		} else
 
@@ -182,12 +182,28 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 
 		/* message has content-range header */
 		if (c = http_message_header(msg, "Content-Range")) {
-			ulong start = 0, end = 0;
+			ulong total = 0, start = 0, end = 0;
+			
+			if (!strncasecmp(Z_STRVAL_P(c), "bytes=", lenof("bytes="))) {
+				char *total_at = NULL, *end_at = NULL;
+				char *start_at = Z_STRVAL_P(c) + lenof("bytes=");
+				
+				start = strtoul(start_at, &end_at, 10);
+				if (end_at) {
+					end = strtoul(end_at + 1, &total_at, 10);
+					if (total_at && strncmp(total_at + 1, "*", 1)) {
+						total = strtoul(total_at + 1, NULL, 10);
+					}
+					
+					if (end >= start && (!total || end < total)) {
+						phpstr_from_string_ex(PHPSTR(msg), body, (size_t) (end + 1 - start));
+						continue_at = body + (end + 1 - start);
+					}
+				}
+			}
 
-			sscanf(Z_STRVAL_P(c), "bytes=%lu-%lu", &start, &end);
-			if (end > start) {
-				phpstr_from_string_ex(PHPSTR(msg), body, (size_t) (end - start));
-				continue_at = body + (end - start);
+			if (!continue_at) {
+				http_error_ex(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid Content-Range header: %s", Z_STRVAL_P(c));
 			}
 		} else
 
diff --git a/tests/parse_message_003.phpt b/tests/parse_message_003.phpt
new file mode 100644
index 0000000..56804b6
--- /dev/null
+++ b/tests/parse_message_003.phpt
@@ -0,0 +1,31 @@
+--TEST--
+content range message
+--SKIPIF--
+<?php
+include 'skip.inc';
+?>
+--FILE--
+<?php
+echo "-TEST\n";
+
+$message = 
+"HTTP/1.1 200 Ok\n".
+"Content-Range: bytes=0-1/5\n\n".
+"OK\n";
+
+$msg = http_parse_message($message);
+var_dump($msg->body);
+
+$message = 
+"HTTP/1.1 200 Ok\n".
+"Content-Range: bytes=0-1/1\n\n".
+"X\n";
+
+$msg = http_parse_message($message);
+
+echo "Done\n";
+--EXPECTF--
+%sTEST
+string(2) "OK"
+%s Invalid Content-Range header: bytes=0-1/1 in%s
+Done