X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=8ba8259b56dcee449c9cf5c4dbce5bb5e3d20dd8;hp=e76846c43dac7f40c7b35a0c88c40137e4fcdc0c;hb=4f5d70d375dac27459a80c1e5271697c1f46c675;hpb=e434da0fad7db62d86c236c68b22150165f2647a

diff --git a/http_api.c b/http_api.c
index e76846c..8ba8259 100644
--- a/http_api.c
+++ b/http_api.c
@@ -30,6 +30,7 @@
 #include "php_http_send_api.h"
 
 #ifdef ZEND_ENGINE_2
+#	include "zend_exceptions.h"
 #	include "php_http_exception_object.h"
 #endif
 
@@ -70,7 +71,7 @@ void _http_error_ex(long type, long code, const char *format, ...)
 #ifdef ZEND_ENGINE_2
 		char *message;
 		vspprintf(&message, 0, format, args);
-		zend_throw_exception(http_exception_get_default(), message, code TSRMLS_CC);
+		zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
 #else
 		type = E_WARNING;
 #endif
@@ -132,7 +133,7 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 
 
 /* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
-PHP_HTTP_API char *_http_chunked_decode(const char *encoded, size_t encoded_len,
+PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len,
 	char **decoded, size_t *decoded_len TSRMLS_DC)
 {
 	const char *e_ptr;
@@ -144,45 +145,40 @@ PHP_HTTP_API char *_http_chunked_decode(const char *encoded, size_t encoded_len,
 	e_ptr = encoded;
 
 	while (((e_ptr - encoded) - encoded_len) > 0) {
-		char hex_len[9] = {0};
+		char *n_ptr;
 		size_t chunk_len = 0;
-		int i = 0;
 
-		/* read in chunk size */
-		while (isxdigit(*e_ptr)) {
-			if (i == 9) {
-				http_error_ex(E_WARNING, HTTP_E_PARSE, "Chunk size is too long: 0x%s...", hex_len);
-				efree(*decoded);
+		chunk_len = strtol(e_ptr, &n_ptr, 16);
+
+		if (n_ptr == e_ptr) {
+			/* don't fail on apperently not encoded data */
+			if (e_ptr == encoded) {
+				memcpy(*decoded, encoded, encoded_len);
+				*decoded_len = encoded_len;
+				return encoded + encoded_len;
+			} else {
+				char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
+				http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+				efree(error);
 				return NULL;
 			}
-			hex_len[i++] = *e_ptr++;
+		} else {
+			e_ptr = n_ptr;
 		}
 
 		/* reached the end */
-		if (!strcmp(hex_len, "0")) {
+		if (!chunk_len) {
 			break;
 		}
 
 		/* new line */
 		if (strncmp(e_ptr, HTTP_CRLF, 2)) {
-			http_error_ex(E_WARNING, HTTP_E_PARSE, 
-				"Invalid character (expected 0x0D 0x0A; got: 0x%x(%c) 0x%x(%c))", 
-				*e_ptr, *e_ptr, *(e_ptr + 1), *(e_ptr + 1));
+			http_error_ex(E_WARNING, HTTP_E_PARSE,
+				"Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *e_ptr, *(e_ptr + 1));
 			efree(*decoded);
 			return NULL;
 		}
 
-		/* hex to long */
-		{
-			char *error = NULL;
-			chunk_len = strtol(hex_len, &error, 16);
-			if (error == hex_len) {
-				http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size string: '%s'", hex_len);
-				efree(*decoded);
-				return NULL;
-			}
-		}
-
 		memcpy(d_ptr, e_ptr += 2, chunk_len);
 		d_ptr += chunk_len;
 		e_ptr += chunk_len + 2;
@@ -225,7 +221,7 @@ PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t response_len,
 		memcpy(*body, real_body, *body_len);
 	}
 
-	return http_parse_headers_ex(header, real_body ? response_len - *body_len : response_len, headers, 1);
+	return http_parse_headers_ex(header, headers, 1);
 }
 /* }}} */