X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_api.h;h=16f4fc267e8290292544925b81ef415b493828dc;hp=78355a63c47f4bea0b7b14c617b68cf56ab9afaf;hb=62fd5b5f1e43cf04e0467a48578826726cfe5821;hpb=3fae71eb51f3b0f09cf61639991a44051da8c0bc

diff --git a/php_http_message_api.h b/php_http_message_api.h
index 78355a6..16f4fc2 100644
--- a/php_http_message_api.h
+++ b/php_http_message_api.h
@@ -18,19 +18,7 @@
 #ifndef PHP_HTTP_MESSAGE_API_H
 #define PHP_HTTP_MESSAGE_API_H
 
-/*
-DUMP:
-HttpMessage
-	->toResponseString();
-	->toRequestString();
-	->__toString();	->__sleep(); ->serialize();
-	->fromString(); __wakeup($message); ->unserialize();
-	->setStatusCode();
-	->setHeader(); ->addHeader()...
-*/
-
 #include "phpstr/phpstr.h"
-#include "php_http_headers_api.h"
 
 typedef enum {
 	HTTP_MSG_NONE,
@@ -47,41 +35,62 @@ struct _http_message {
 
 	union {
 		struct {
-			float http_version;
+			double http_version;
 			char *method;
 			char *URI;
 		} request;
 
 		struct {
-			float http_version;
+			double http_version;
 			int code;
 		} response;
 
 	} info;
 
-	size_t 		len;
-	char		*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
 
+/* shorthand for type checks */
+#define HTTP_MSG_TYPE(TYPE, msg) ((msg) && ((msg)->type == HTTP_MSG_ ##TYPE))
+
 #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))
 PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t);
 
-#define http_message_parse(m, l) http_message_parse_ex(NULL, (m), (l), 1)
-#define http_message_parse_ex(h, m, l, d) _http_message_parse_ex((h), (m), (l), (d) TSRMLS_CC)
-PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, char *message, size_t length, zend_bool duplicate TSRMLS_DC);
+#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_headers_callback _http_message_parse_headers_callback
-PHP_HTTP_API void _http_message_parse_headers_callback(void *message, char *http_line, size_t line_length, HashTable **headers TSRMLS_DC);
+#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h))
+#define http_message_header_ex _http_message_header_ex
+static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len)
+{
+	zval **header;
+	if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void **) &header)) {
+		return *header;
+	}
+	return NULL;
+}
+
+#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_dup(m) _http_message_dup((m) TSRMLS_CC)
+PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC);
+
 #define http_message_dtor(m) _http_message_dtor((m))
 PHP_HTTP_API void _http_message_dtor(http_message *message);