X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_object.h;h=6bc06f27ebdb6647193e90359d3a276466760238;hp=38eb79bce0caf7e556691c9fa70f34b11e3a3cf3;hb=32e91737086db53bb1fd9ed9f79d693c43ec459f;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/php_http_message_object.h b/php_http_message_object.h
index 38eb79b..6bc06f2 100644
--- a/php_http_message_object.h
+++ b/php_http_message_object.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -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
@@ -45,10 +42,20 @@ extern void _http_message_object_free(zend_object *object TSRMLS_DC);
 #define HTTP_MSG_PROPHASH_HEADERS              3199929089LU
 #define HTTP_MSG_PROPHASH_PARENT_MESSAGE       2105714836LU
 #define HTTP_MSG_PROPHASH_REQUEST_METHOD       1669022159LU
-#define HTTP_MSG_PROPHASH_REQUEST_URI          3208695486LU
+#define HTTP_MSG_PROPHASH_REQUEST_URL          3208695585LU
 #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_URL    3855913003LU
+#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"); \
@@ -74,14 +81,18 @@ PHP_METHOD(HttpMessage, getResponseCode);
 PHP_METHOD(HttpMessage, setResponseCode);
 PHP_METHOD(HttpMessage, getRequestMethod);
 PHP_METHOD(HttpMessage, setRequestMethod);
-PHP_METHOD(HttpMessage, getRequestUri);
-PHP_METHOD(HttpMessage, setRequestUri);
+PHP_METHOD(HttpMessage, getRequestUrl);
+PHP_METHOD(HttpMessage, setRequestUrl);
 PHP_METHOD(HttpMessage, getHttpVersion);
 PHP_METHOD(HttpMessage, setHttpVersion);
 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