X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_info.h;h=b771c5cc40912cf0e0798e6f5119e8e18dc85b61;hp=92a3f33791c51ebd701f75d621d6b9d081f86ec0;hb=0918074fdd8dc347370e8298bd13ba4c78224ba8;hpb=d926a12aeec96752456eddfbf9a04a002809a0d2

diff --git a/php_http_info.h b/php_http_info.h
index 92a3f33..b771c5c 100644
--- a/php_http_info.h
+++ b/php_http_info.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -14,14 +14,17 @@
 #define PHP_HTTP_INFO_H
 
 #include "php_http_version.h"
+#include "php_http_url.h"
 
-#define PHP_HTTP_INFO_REQUEST_FMT_ARGS(_http_ptr, eol) "%s %s HTTP/%u.%u" eol, \
+#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?(_http_ptr)->info.request.url:"/", \
+				(_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
 
-#define PHP_HTTP_INFO_RESPONSE_FMT_ARGS(_http_ptr, eol) "HTTP/%u.%u %d%s%s" eol, \
+#define PHP_HTTP_INFO_RESPONSE_FMT_ARGS(_http_ptr, tmp, eol) "HTTP/%u.%u %d%s%s" eol, \
 				(_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, \
 				(_http_ptr)->info.response.code?(_http_ptr)->info.response.code:200, \
@@ -31,7 +34,7 @@
 typedef struct php_http_info_data {
 	union {
 		/* GET /foo/bar */
-		struct { char *method; char *url; } request;
+		struct { char *method; php_http_url_t *url; } request;
 		/* 200 Ok */
 		struct { unsigned code; char *status; } response;
 	} info;
@@ -53,10 +56,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);