X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_api.h;h=d529a0a0878b01bed5b3fa8da461f7bdac1bb718;hp=b82f0a7bade7b2a18a9e452c57b43a49acc7a0fa;hb=6c798b95130a0fe8d55f39fd859bb5333f523ccd;hpb=0ac32c9b8590e88a5f110cc8b3154001d5c0c089

diff --git a/php_http_message_api.h b/php_http_message_api.h
index b82f0a7..d529a0a 100644
--- a/php_http_message_api.h
+++ b/php_http_message_api.h
@@ -15,16 +15,8 @@
 
 /* $Id$ */
 
-/*
-DUMP:
-HttpMessage
-	->toResponseString();
-	->toRequestString();
-	->__toString();	->__sleep(); ->serialize();
-	->fromString(); __wakeup($message); ->unserialize();
-	->setStatusCode();
-	->setHeader(); ->addHeader()...
-*/
+#ifndef PHP_HTTP_MESSAGE_API_H
+#define PHP_HTTP_MESSAGE_API_H
 
 #include "phpstr/phpstr.h"
 
@@ -50,40 +42,55 @@ struct _http_message {
 
 		struct {
 			float http_version;
-			int status;
+			int code;
 		} response;
 
 	} info;
 
-	size_t 		len;
-	zend_bool 	dup;
-
-	union {
-		char *dup;
-		const char *ptr;
-	} raw;
-
-	http_message *nested;
+	http_message *parent;
 };
 
 /* required minimum length of an HTTP message "HTTP/1.1 200\r\n" */
 #define HTTP_MSG_MIN_SIZE 15
 
-#define HTTP_MSG_RAW(msg) ( (msg)->dup ? msg->raw.dup : msg->raw.ptr )
+/* shorthand for type checks */
+#define HTTP_MSG_TYPE(TYPE, msg) ((msg) && ((msg)->type == HTTP_MSG_ ##TYPE))
 
-#define http_message_init() _http_message_init_ex(NULL, 0)
+#define http_message_new() _http_message_init_ex(NULL, 0)
+#define http_message_init(m) _http_message_init_ex((m), 0)
 #define http_message_init_ex(m, t) _http_message_init_ex((m), (t))
-#define http_message_free(m) _http_message_free((m))
-#define http_message_dtor(m) _http_message_dtor((m))
+PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t);
 
-PHP_HTTP_API void _http_message_dtor(http_message *message);
-PHP_HTTP_API void _http_message_free(http_message *message);
+#define http_message_set_type(m, t) _http_message_set_type((m), (t))
+PHP_HTTP_API void _http_message_set_type(http_message *m, http_message_type t);
 
-#define http_message_parse(m, l) http_message_parse_ex((m), (l), 1)
-#define http_message_parse_ex(m, l, d) _http_message_parse_ex((m), (l), (d) TSRMLS_CC)
-PHP_HTTP_API http_message *_http_message_parse_ex(const char *message, size_t length, zend_bool duplicate TSRMLS_DC);
+#define http_message_parse(m, l) http_message_parse_ex(NULL, (m), (l))
+#define http_message_parse_ex(h, m, l) _http_message_parse_ex((h), (m), (l) TSRMLS_CC)
+PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t length TSRMLS_DC);
 
 #define http_message_tostring(m, s, l) _http_message_tostring((m), (s), (l))
 PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length);
 
+#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_send(m) _http_message_send((m) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC);
+
+#define http_message_dtor(m) _http_message_dtor((m))
+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);
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */