X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_info.c;h=48da6bfe2170452f4aa3adb5d2a20d35dabc6ed4;hb=3d3727416df3f7b51b10a5c5d5af7249d5500222;hp=81bf727b1e4d135bf931af3b084984743f41dc0a;hpb=76b679d046ac10c00eb13da217f2adaaad580251;p=m6w6%2Fext-http

diff --git a/src/php_http_info.c b/src/php_http_info.c
index 81bf727..48da6bf 100644
--- a/src/php_http_info.c
+++ b/src/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));
@@ -30,11 +30,11 @@ void php_http_info_dtor(php_http_info_t *i)
 			PTR_SET(PHP_HTTP_INFO(i).request.method, NULL);
 			PTR_SET(PHP_HTTP_INFO(i).request.url, NULL);
 			break;
-		
+
 		case PHP_HTTP_RESPONSE:
 			PTR_SET(PHP_HTTP_INFO(i).response.status, NULL);
 			break;
-		
+
 		default:
 			break;
 	}
@@ -49,7 +49,7 @@ void php_http_info_free(php_http_info_t **i)
 	}
 }
 
-void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, const char *eol TSRMLS_DC)
+void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, const char *eol)
 {
 	char *tmp = NULL;
 
@@ -74,11 +74,12 @@ void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, con
 				info->http.info.request.method&&!strcasecmp(info->http.info.request.method,"CONNECT")?(
 				info->http.info.request.url?php_http_url_authority_to_string(info->http.info.request.url, &(tmp), NULL):"0"):(
 				info->http.info.request.url?php_http_url_to_string(info->http.info.request.url, &(tmp), NULL, 0):"/"),
-				info->http.version.major||info->http.version.major?info->http.version.major:1,
+				info->http.version.major||info->http.version.minor?info->http.version.major:1,
 				info->http.version.major||info->http.version.minor?info->http.version.minor:1,
 				eol);
 	} else if (info->type == PHP_HTTP_RESPONSE){
-		*len = spprintf(str, 0, "HTTP/%u.%u %d%s%s%s", info->http.version.major||info->http.version.major?info->http.version.major:1,
+		*len = spprintf(str, 0, "HTTP/%u.%u %d%s%s%s",
+				info->http.version.major||info->http.version.minor?info->http.version.major:1,
 				info->http.version.major||info->http.version.minor?info->http.version.minor:1,
 				info->http.info.response.code?info->http.info.response.code:200,
 				info->http.info.response.status&&*info->http.info.response.status ? " ":"",
@@ -86,32 +87,32 @@ void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, con
 				eol);
 	}
 
-	STR_FREE(tmp);
+	PTR_FREE(tmp);
 }
 
-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, *off;
 	zend_bool free_info = !info;
-	
+
 	/* sane parameter */
-	if ((!pre_header) || (!*pre_header)) {
+	if (UNEXPECTED((!pre_header) || (!*pre_header))) {
 		return NULL;
 	}
-	
+
 	/* where's the end of the line */
-	if (!(end = php_http_locate_eol(pre_header, NULL))) {
+	if (UNEXPECTED(!(end = php_http_locate_eol(pre_header, NULL)))) {
 		end = pre_header + strlen(pre_header);
 	}
-	
+
 	/* there must be HTTP/1.x in the line */
 	if (!(http = php_http_locate_str(pre_header, end - pre_header, "HTTP/", lenof("HTTP/")))) {
 		return NULL;
 	}
-	
-	info = php_http_info_init(info TSRMLS_CC);
 
-	if (!php_http_version_parse(&info->http.version, http TSRMLS_CC)) {
+	info = php_http_info_init(info);
+
+	if (UNEXPECTED(!php_http_version_parse(&info->http.version, http))) {
 		if (free_info) {
 			php_http_info_free(&info);
 		}
@@ -125,7 +126,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 	}
 
 	/* and nothing than SPACE or NUL after HTTP/X(.x) */
-	if (*off && (!PHP_HTTP_IS_CTYPE(space, *off))) {
+	if (UNEXPECTED(*off && (!PHP_HTTP_IS_CTYPE(space, *off)))) {
 		if (free_info) {
 			php_http_info_free(&info);
 		}
@@ -143,10 +144,10 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 	/* is response */
 	if (pre_header == http) {
 		const char *status = NULL, *code = off;
-		
+
 		info->type = PHP_HTTP_RESPONSE;
-		while (' ' == *code) ++code;
-		if (end > code) {
+		while (code < end && ' ' == *code) ++code;
+		if (EXPECTED(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');
 			PHP_HTTP_INFO(info).response.code += 10*(*code++ - '0');
@@ -161,35 +162,35 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		} else {
 			PHP_HTTP_INFO(info).response.code = 0;
 		}
-		if (status && end > status) {
-			while (' ' == *status) ++status;
+		if (EXPECTED(status && end > status)) {
+			while (' ' == *status && end > status) ++status;
 			PHP_HTTP_INFO(info).response.status = estrndup(status, end - status);
 		} else {
 			PHP_HTTP_INFO(info).response.status = NULL;
 		}
-		
+
 		return info;
 	}
-	
+
 	/* is request */
 	else if (*(http - 1) == ' ' && (!*off || *off == '\r' || *off == '\n')) {
 		const char *url = strchr(pre_header, ' ');
-		
+
 		info->type = PHP_HTTP_REQUEST;
-		if (url && http > url) {
+		if (EXPECTED(url && http > url)) {
 			size_t url_len = url - pre_header;
 
 			PHP_HTTP_INFO(info).request.method = estrndup(pre_header, url_len);
 
-			while (' ' == *url) ++url;
+			while (' ' == *url && http > url) ++url;
 			while (' ' == *(http-1)) --http;
 
-			if (http > url) {
+			if (EXPECTED(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, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);
+				if (UNEXPECTED(strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT"))) {
+					PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, PHP_HTTP_URL_STDFLAGS);
 				} else {
-					PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);
+					PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS);
 				}
 				if (!PHP_HTTP_INFO(info).request.url) {
 					PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
@@ -203,7 +204,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 			PHP_HTTP_INFO(info).request.method = NULL;
 			PHP_HTTP_INFO(info).request.url = NULL;
 		}
-		
+
 		return info;
 	}