X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_api.h;h=9ba60817e9161d1ad2acd0b70f6daaa4b0f331c6;hp=16f4fc267e8290292544925b81ef415b493828dc;hb=5dca59e3a269c903b395d97abe831c0fc138b5b6;hpb=3f8d6ea256f520d439cebc37c46bb93c30b2660e

diff --git a/php_http_message_api.h b/php_http_message_api.h
index 16f4fc2..9ba6081 100644
--- a/php_http_message_api.h
+++ b/php_http_message_api.h
@@ -18,12 +18,13 @@
 #ifndef PHP_HTTP_MESSAGE_API_H
 #define PHP_HTTP_MESSAGE_API_H
 
+#include "php_http_info_api.h"
 #include "phpstr/phpstr.h"
 
 typedef enum {
-	HTTP_MSG_NONE,
-	HTTP_MSG_REQUEST,
-	HTTP_MSG_RESPONSE
+	HTTP_MSG_NONE		= 0,
+	HTTP_MSG_REQUEST	= IS_HTTP_REQUEST,
+	HTTP_MSG_RESPONSE	= IS_HTTP_RESPONSE,
 } http_message_type;
 
 typedef struct _http_message http_message;
@@ -32,26 +33,12 @@ struct _http_message {
 	phpstr body;
 	HashTable hdrs;
 	http_message_type type;
-
-	union {
-		struct {
-			double http_version;
-			char *method;
-			char *URI;
-		} request;
-
-		struct {
-			double http_version;
-			int code;
-		} response;
-
-	} info;
-
+	struct http_info http;
 	http_message *parent;
 };
 
-/* required minimum length of an HTTP message "HTTP/1.1 200\r\n" */
-#define HTTP_MSG_MIN_SIZE 15
+/* required minimum length of an HTTP message "HTTP/1.1" */
+#define HTTP_MSG_MIN_SIZE 8
 
 /* shorthand for type checks */
 #define HTTP_MSG_TYPE(TYPE, msg) ((msg) && ((msg)->type == HTTP_MSG_ ##TYPE))
@@ -85,6 +72,9 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 #define http_message_serialize(m, s, l) _http_message_serialize((m), (s), (l))
 PHP_HTTP_API void _http_message_serialize(http_message *message, char **string, size_t *length);
 
+#define http_message_tostruct_recursive(m, s) _http_message_tostruct_recursive((m), (s) TSRMLS_CC)
+PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *strct TSRMLS_DC);
+
 #define http_message_send(m) _http_message_send((m) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC);
 
@@ -95,7 +85,7 @@ PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC);
 PHP_HTTP_API void _http_message_dtor(http_message *message);
 
 #define http_message_free(m) _http_message_free((m))
-PHP_HTTP_API void _http_message_free(http_message *message);
+PHP_HTTP_API void _http_message_free(http_message **message);
 
 #endif