- release 0.19.0

[m6w6/ext-http] / php_http_message_object.h

diff --git a/php_http_message_object.h b/php_http_message_object.h
index 38eb79bce0caf7e556691c9fa70f34b11e3a3cf3..3a3dfe8da97e2d849e3c3a14947629587f475bb2 100644 (file)
--- a/php_http_message_object.h
+++ b/php_http_message_object.h
@@ -16,8 +16,6 @@
 #define PHP_HTTP_MESSAGE_OBJECT_H
 #ifdef ZEND_ENGINE_2
 
-#include "php_http_message_api.h"
-
 typedef struct {
        zend_object zo;
        http_message *message;
@@ -29,14 +27,13 @@ extern zend_function_entry http_message_object_fe[];
 
 extern PHP_MINIT_FUNCTION(http_message_object);
 
-#define http_message_object_new _http_message_object_new
+#define http_message_object_new(ce) _http_message_object_new((ce) TSRMLS_CC)
 extern zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC);
-#define http_message_object_new_ex(ce, msg) _http_message_object_new_ex(ce, msg TSRMLS_CC)
-#define http_message_object_from_msg(msg) _http_message_object_new_ex(http_message_object_ce, msg TSRMLS_CC)
-extern zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC);
-#define http_message_object_clone(zobj) _http_message_object_clone(zobj TSRMLS_CC)
-extern zend_object_value _http_message_object_clone(zval *object TSRMLS_DC);
-#define http_message_object_free _http_message_object_free
+#define http_message_object_new_ex(ce, msg, ptr) _http_message_object_new_ex((ce), (msg), (ptr) TSRMLS_CC)
+extern zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg, http_message_object **ptr TSRMLS_DC);
+#define http_message_object_clone(zobj) _http_message_object_clone_obj(zobj TSRMLS_CC)
+extern zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC);
+#define http_message_object_free(o) _http_message_object_free((o) TSRMLS_CC)
 extern void _http_message_object_free(zend_object *object TSRMLS_DC);
 
 #define HTTP_MSG_PROPHASH_TYPE                  276192743LU
@@ -49,6 +46,16 @@ extern void _http_message_object_free(zend_object *object TSRMLS_DC);
 #define HTTP_MSG_PROPHASH_RESPONSE_STATUS      3857097400LU
 #define HTTP_MSG_PROPHASH_RESPONSE_CODE        1305615119LU
 
+#define HTTP_MSG_CHILD_PROPHASH_TYPE            624467825LU
+#define HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION   1021966997LU
+#define HTTP_MSG_CHILD_PROPHASH_BODY            602749469LU
+#define HTTP_MSG_CHILD_PROPHASH_HEADERS        3626850379LU
+#define HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE 3910157662LU
+#define HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD 3473464985LU
+#define HTTP_MSG_CHILD_PROPHASH_REQUEST_URI    3855912904LU
+#define HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS 3274168514LU
+#define HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE  1750746777LU
+
 #define HTTP_MSG_CHECK_OBJ(obj, dofail) \
        if (!(obj)->message) { \
                http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is empty"); \
@@ -82,6 +89,10 @@ PHP_METHOD(HttpMessage, getParentMessage);
 PHP_METHOD(HttpMessage, send);
 PHP_METHOD(HttpMessage, toString);
 
+PHP_METHOD(HttpMessage, count);
+PHP_METHOD(HttpMessage, serialize);
+PHP_METHOD(HttpMessage, unserialize);
+
 PHP_METHOD(HttpMessage, fromString);
 
 #endif