X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_info_api.h;h=923545d31070f3aff28dbd90211dd10632a7e43b;hp=17f6a266ead8b090de21af2d8fc02ffc9bac3c99;hb=e29a410679b63b8f96b6890d1418f39d9ed489cc;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/php_http_info_api.h b/php_http_info_api.h
index 17f6a26..923545d 100644
--- a/php_http_info_api.h
+++ b/php_http_info_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -20,27 +20,38 @@
 
 #define HTTP_INFO(ptr) (ptr)->http.info
 
-typedef struct {
+#define HTTP_INFO_REQUEST_FMT_ARGS(_http_ptr, _EOL) "%s %s HTTP/%1.1f" _EOL, \
+				(_http_ptr)->info.request.method?(_http_ptr)->info.request.method:"UNKNOWN", \
+				(_http_ptr)->info.request.url?(_http_ptr)->info.request.url:"/", \
+				(_http_ptr)->version>0.0?(_http_ptr)->version:1.1
+
+#define HTTP_INFO_RESPONSE_FMT_ARGS(_http_ptr, _EOL) "HTTP/%1.1f %d%s%s" _EOL, \
+				(_http_ptr)->version>0.0?(_http_ptr)->version:1.1, \
+				(_http_ptr)->info.response.code?(_http_ptr)->info.response.code:200, \
+				(_http_ptr)->info.response.status&&*(_http_ptr)->info.response.status ? " ":"", \
+				STR_PTR((_http_ptr)->info.response.status)
+
+typedef struct _http_request_info_t {
 	char *method;
-	char *URI;
+	char *url;
 } http_request_info;
 
-typedef struct {
+typedef struct _http_response_info_t {
 	int code;
 	char *status;
 } http_response_info;
 
-typedef union {
+typedef union _http_info_union_t {
 	http_request_info request;
 	http_response_info response;
-} http_info_t;
+} http_info_union;
 
 struct http_info {
-	http_info_t info;
+	http_info_union info;
 	double version;
 };
 
-typedef struct {
+typedef struct _http_info_t {
 	struct http_info http;
 	int type;
 } http_info;