X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_info.c;h=cbaee88490c17421a7c618f7653ed2c6c8c819bc;hp=6eef822707c1bfa6082672be7a91762e31ee094e;hb=d5c7f974d81c724c6fad8b54f1c37ce0795119de;hpb=57e944b102006abfa4005337b0ac5901425f4289

diff --git a/src/php_http_info.c b/src/php_http_info.c
index 6eef822..cbaee88 100644
--- a/src/php_http_info.c
+++ b/src/php_http_info.c
@@ -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,31 +49,83 @@ 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)
+{
+	char *tmp = NULL;
+
+	if (info->http.version.major == 2) {
+		if (info->type == PHP_HTTP_REQUEST) {
+			*len = spprintf(str, 0, "%s %s HTTP/2%s",
+					info->http.info.request.method?info->http.info.request.method:"UNKNOWN",
+					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):"/"),
+					eol);
+		} else if (info->type == PHP_HTTP_RESPONSE) {
+			*len = spprintf(str, 0, "HTTP/2 %d%s%s%s",
+					info->http.info.response.code?info->http.info.response.code:200,
+					info->http.info.response.status&&*info->http.info.response.status ? " ":"",
+					STR_PTR(info->http.info.response.status),
+					eol);
+		}
+	} else if (info->type == PHP_HTTP_REQUEST) {
+		*len = spprintf(str, 0, "%s %s HTTP/%u.%u%s",
+				info->http.info.request.method?info->http.info.request.method:"UNKNOWN",
+				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.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,
+				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 ? " ":"",
+				STR_PTR(info->http.info.response.status),
+				eol);
+	}
+
+	PTR_FREE(tmp);
+}
+
 php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header)
 {
-	const char *end, *http;
+	const char *end, *http, *off;
 	zend_bool free_info = !info;
-	
+
 	/* sane parameter */
 	if ((!pre_header) || (!*pre_header)) {
 		return NULL;
 	}
-	
+
 	/* where's the end of the line */
 	if (!(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);
 
-	/* and nothing than SPACE or NUL after HTTP/X.x */
-	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 (!php_http_version_parse(&info->http.version, http)) {
+		if (free_info) {
+			php_http_info_free(&info);
+		}
+		return NULL;
+	}
+
+	/* clumsy fix for changed libcurl behaviour in 7.49.1, see https://github.com/curl/curl/issues/888 */
+	off = &http[lenof("HTTP/X")];
+	if (info->http.version.major < 2 || (info->http.version.major == 2 && *off == '.')) {
+		off += 2;
+	}
+
+	/* and nothing than SPACE or NUL after HTTP/X(.x) */
+	if (*off && (!PHP_HTTP_IS_CTYPE(space, *off))) {
 		if (free_info) {
 			php_http_info_free(&info);
 		}
@@ -90,11 +142,11 @@ 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 = http + sizeof("HTTP/X.x");
-		
+		const char *status = NULL, *code = off;
+
 		info->type = PHP_HTTP_RESPONSE;
 		while (code < end && ' ' == *code) ++code;
-		if (code && end > code) {
+		if (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');
@@ -115,14 +167,14 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		} else {
 			PHP_HTTP_INFO(info).response.status = NULL;
 		}
-		
+
 		return info;
 	}
-	
+
 	/* is request */
-	else if (*(http - 1) == ' ' && (!http[lenof("HTTP/X.x")] || http[lenof("HTTP/X.x")] == '\r' || http[lenof("HTTP/X.x")] == '\n')) {
+	else if (*(http - 1) == ' ' && (!*off || *off == '\r' || *off == '\n')) {
 		const char *url = strchr(pre_header, ' ');
-		
+
 		info->type = PHP_HTTP_REQUEST;
 		if (url && http > url) {
 			size_t url_len = url - pre_header;
@@ -135,9 +187,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);
+					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, ~0);
+					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);
@@ -151,11 +203,11 @@ 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;
 	}
 
-	/* some darn header containing HTTP/X.x */
+	/* some darn header containing HTTP/X(.x) */
 	else {
 		if (free_info) {
 			php_http_info_free(&info);