X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_info.c;h=6eef822707c1bfa6082672be7a91762e31ee094e;hp=4fb067fcd2610e63a4110663e3172a3e62d9ca64;hb=4bf1b4570329514fa00dc68c6e02f581c3792d73;hpb=c05ef71b26a8d16bf5af2bd8275e08ba5ae02b52

diff --git a/php_http_info.c b/php_http_info.c
index 4fb067f..6eef822 100644
--- a/php_http_info.c
+++ b/php_http_info.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-php_http_info_t *php_http_info_init(php_http_info_t *i TSRMLS_DC)
+php_http_info_t *php_http_info_init(php_http_info_t *i)
 {
 	if (!i) {
 		i = emalloc(sizeof(*i));
@@ -49,7 +49,7 @@ void php_http_info_free(php_http_info_t **i)
 	}
 }
 
-php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC)
+php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header)
 {
 	const char *end, *http;
 	zend_bool free_info = !info;
@@ -69,10 +69,10 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		return NULL;
 	}
 	
-	info = php_http_info_init(info TSRMLS_CC);
+	info = php_http_info_init(info);
 
 	/* and nothing than SPACE or NUL after HTTP/X.x */
-	if (!php_http_version_parse(&info->http.version, http TSRMLS_CC)
+	if (!php_http_version_parse(&info->http.version, http)
 	||	(http[lenof("HTTP/X.x")] && (!PHP_HTTP_IS_CTYPE(space, http[lenof("HTTP/X.x")])))) {
 		if (free_info) {
 			php_http_info_free(&info);
@@ -93,7 +93,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		const char *status = NULL, *code = http + sizeof("HTTP/X.x");
 		
 		info->type = PHP_HTTP_RESPONSE;
-		while (' ' == *code) ++code;
+		while (code < end && ' ' == *code) ++code;
 		if (code && end > code) {
 			/* rfc7230#3.1.2 The status-code element is a 3-digit integer code */
 			PHP_HTTP_INFO(info).response.code = 100*(*code++ - '0');
@@ -135,9 +135,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 			if (http > url) {
 				/* CONNECT presents an authority only */
 				if (strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT")) {
-					PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0 TSRMLS_CC);
+					PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0);
 				} else {
-					PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0 TSRMLS_CC);
+					PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0);
 				}
 				if (!PHP_HTTP_INFO(info).request.url) {
 					PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);