X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_info.c;h=48da6bfe2170452f4aa3adb5d2a20d35dabc6ed4;hp=cbaee88490c17421a7c618f7653ed2c6c8c819bc;hb=8f8c6de6ae23ee114c9fac41d82ae866c1747132;hpb=d5c7f974d81c724c6fad8b54f1c37ce0795119de

diff --git a/src/php_http_info.c b/src/php_http_info.c
index cbaee88..48da6bf 100644
--- a/src/php_http_info.c
+++ b/src/php_http_info.c
@@ -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 ? " ":"",
@@ -95,12 +96,12 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 	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);
 	}
 
@@ -111,7 +112,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 
 	info = php_http_info_init(info);
 
-	if (!php_http_version_parse(&info->http.version, http)) {
+	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);
 		}
@@ -146,7 +147,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 
 		info->type = PHP_HTTP_RESPONSE;
 		while (code < end && ' ' == *code) ++code;
-		if (end > 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,8 +162,8 @@ 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;
@@ -176,17 +177,17 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		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")) {
+				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);