Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_info.h

diff --git a/php_http_info.h b/php_http_info.h
index 579f5733b91967be9db0c27b95904472cad3b88a..8a52ee2df19adf543a89e0be0b6adab47e42ed8a 100644 (file)
--- 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,