X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=18b14e2cf1265803f1068167e21f9169f6dfb7ce;hp=e9f3bf093afaa037b5955ba10633e080cc8317d8;hb=a960f6fd6e637ffa03a87985a7df3bc9c98a360b;hpb=2b7331c5fdb73cb48f7f60a8e4ec88766581ced3

diff --git a/http_api.c b/http_api.c
index e9f3bf0..18b14e2 100644
--- a/http_api.c
+++ b/http_api.c
@@ -27,8 +27,10 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_headers_api.h"
+#include "php_http_send_api.h"
 
 #ifdef ZEND_ENGINE_2
+#	include "zend_exceptions.h"
 #	include "php_http_exception_object.h"
 #endif
 
@@ -69,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
@@ -81,6 +83,39 @@ void _http_error_ex(long type, long code, const char *format, ...)
 }
 /* }}} */
 
+/* {{{ STATUS http_exit(int, char*) */
+STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC)
+{
+	if (SUCCESS != http_send_status_header(status, header)) {
+		http_error_ex(E_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
+		if (free_header && header) {
+			efree(header);
+		}
+		return FAILURE;
+	}
+	if (free_header && header) {
+		efree(header);
+	}
+	zend_bailout();
+	/* fake */
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ STATUS http_check_method(char *) */
+STATUS _http_check_method_ex(const char *method, const char *methods)
+{
+	const char *found;
+
+	if (	(found = strstr(methods, method)) &&
+			(found == method || !isalpha(found[-1])) &&
+			(!isalpha(found[strlen(method) + 1]))) {
+		return SUCCESS;
+	}
+	return FAILURE;
+}
+/* }}} */
+
 /* {{{ zval *http_get_server_var_ex(char *, size_t) */
 PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC)
 {
@@ -97,8 +132,8 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 /* }}} */
 
 
-/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */
-PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len,
+/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
+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;
@@ -110,50 +145,50 @@ PHP_HTTP_API STATUS _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};
+		int no_crlf = 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);
+		chunk_len = strtol(e_ptr, &n_ptr, 16);
+
+		/* check if:
+		 * - we could not read in chunk size
+		 * - chunk size is not followed by HTTP_CRLF|NUL
+		 */
+		if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) {
+			/* 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 {
 				efree(*decoded);
-				return FAILURE;
+				if (no_crlf) {
+					http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
+				} 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: %x %x)", *e_ptr, *(e_ptr + 1));
-			efree(*decoded);
-			return FAILURE;
-		}
-
-		/* 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 FAILURE;
-			}
-		}
-
 		memcpy(d_ptr, e_ptr += 2, chunk_len);
 		d_ptr += chunk_len;
 		e_ptr += chunk_len + 2;
 		*decoded_len += chunk_len;
 	}
 
-	return SUCCESS;
+	return e_ptr;
 }
 /* }}} */
 
@@ -189,7 +224,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);
 }
 /* }}} */