X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_info.h;h=8a52ee2df19adf543a89e0be0b6adab47e42ed8a;hp=d31b505d8d3e378b99628acbf4b906e2cb179121;hb=468e8d748d365811af4ce890fd8fc4c1f88cc08a;hpb=a4114b0ea5757190fdd7218dbf23588b6ae6e9a8

diff --git a/php_http_info.h b/php_http_info.h
index d31b505..8a52ee2 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
 
@@ -39,6 +41,8 @@ typedef struct php_http_info_data {
 	php_http_version_t version;
 } php_http_info_data_t;
 
+#undef PHP_HTTP_REQUEST
+#undef PHP_HTTP_RESPONSE
 typedef enum php_http_info_type {
 	PHP_HTTP_NONE = 0,
 	PHP_HTTP_REQUEST,
@@ -54,10 +58,10 @@ typedef struct php_http_info {
 	PHP_HTTP_INFO_IMPL(http, type)
 } php_http_info_t;
 
-typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info TSRMLS_DC);
+typedef zend_bool (*php_http_info_callback_t)(void **callback_data, HashTable **headers, php_http_info_t *info);
 
-PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info TSRMLS_DC);
-PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC);
+PHP_HTTP_API php_http_info_t *php_http_info_init(php_http_info_t *info);
+PHP_HTTP_API php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header);
 PHP_HTTP_API void php_http_info_dtor(php_http_info_t *info);
 PHP_HTTP_API void php_http_info_free(php_http_info_t **info);