- fix builds and tests without libcurl linked in

[m6w6/ext-http] / php_http_message_api.h

diff --git a/php_http_message_api.h b/php_http_message_api.h
index 4de90bcd6fec13257fd9cc2dd014659c03679a03..16f4fc267e8290292544925b81ef415b493828dc 100644 (file)
--- 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"
 
@@ -43,42 +35,76 @@ struct _http_message {
 
        union {
                struct {
-                       float http_version;
+                       double http_version;
                        char *method;
                        char *URI;
                } request;
 
                struct {
-                       float http_version;
-                       int status;
+                       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
 
-#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);
+
+#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_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);
-PHP_HTTP_API void _http_message_free(http_message *message);
 
-#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(char *message, size_t length, zend_bool duplicate TSRMLS_DC);
+#define http_message_free(m) _http_message_free((m))
+PHP_HTTP_API void _http_message_free(http_message *message);
 
-#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);
+#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
+ */