From: Michael Wallner <mike@php.net>
Date: Thu, 5 Feb 2015 10:17:16 +0000 (+0100)
Subject: use url authority parser for CONNECT messages
X-Git-Tag: RELEASE_2_3_0_RC1~61
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=db0ebb809983eb3dbda84dee61dfceb08feb20c3;p=m6w6%2Fext-http

use url authority parser for CONNECT messages
---

diff --git a/php_http_info.c b/php_http_info.c
index 2c0f114..876c720 100644
--- a/php_http_info.c
+++ b/php_http_info.c
@@ -116,11 +116,20 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 		
 		info->type = PHP_HTTP_REQUEST;
 		if (url && http > url) {
-			PHP_HTTP_INFO(info).request.method = estrndup(pre_header, url - pre_header);
+			size_t url_len = url - pre_header;
+
+			PHP_HTTP_INFO(info).request.method = estrndup(pre_header, url_len);
+
 			while (' ' == *url) ++url;
 			while (' ' == *(http-1)) --http;
+
 			if (http > url) {
-				PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0 TSRMLS_CC);
+				/* 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);
+				} else {
+					PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0 TSRMLS_CC);
+				}
 			} else {
 				PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
 				return NULL;
diff --git a/php_http_info.h b/php_http_info.h
index d31b505..4f02908 100644
--- a/php_http_info.h
+++ b/php_http_info.h
@@ -18,7 +18,9 @@
 
 #define PHP_HTTP_INFO_REQUEST_FMT_ARGS(_http_ptr, tmp, eol) "%s %s HTTP/%u.%u" eol, \
 				(_http_ptr)->info.request.method?(_http_ptr)->info.request.method:"UNKNOWN", \
-				(_http_ptr)->info.request.url?php_http_url_to_string((_http_ptr)->info.request.url, &(tmp), NULL, 0):"/", \
+				(_http_ptr)->info.request.method&&!strcasecmp((_http_ptr)->info.request.method,"CONNECT")?( \
+				(_http_ptr)->info.request.url?php_http_url_authority_to_string((_http_ptr)->info.request.url, &(tmp), NULL):"0"):( \
+				(_http_ptr)->info.request.url?php_http_url_to_string((_http_ptr)->info.request.url, &(tmp), NULL, 0):"/"), \
 				(_http_ptr)->version.major||(_http_ptr)->version.major?(_http_ptr)->version.major:1, \
 				(_http_ptr)->version.major||(_http_ptr)->version.minor?(_http_ptr)->version.minor:1