release 2.4.0

[m6w6/ext-http] / php_http_message.h

diff --git a/php_http_message.h b/php_http_message.h
index ea747fe671558b30244594b7327c5f2d16df6ba3..780ea68ce747431df25d536a864f393a0739b79a 100644 (file)
--- a/php_http_message.h
+++ b/php_http_message.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -18,11 +18,6 @@
 /* required minimum length of an HTTP message "HTTP/1.1" */
 #define PHP_HTTP_MESSAGE_MIN_SIZE 8
 #define PHP_HTTP_MESSAGE_TYPE(TYPE, msg) ((msg) && ((msg)->type == PHP_HTTP_ ##TYPE))
-#define PHP_HTTP_MESSAGE_TYPE_CHECK(type, msg, action) \
-               if (!PHP_HTTP_MESSAGE_TYPE(type, (msg))) { \
-                       php_http_error(HE_NOTICE, PHP_HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type "#type); \
-                       action; \
-               }
 
 typedef php_http_info_type_t php_http_message_type_t;
 typedef struct php_http_message php_http_message_t;
@@ -87,7 +82,8 @@ PHP_MSHUTDOWN_FUNCTION(http_message);
 
 void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top /* = 1 */ TSRMLS_DC);
 void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC);
-STATUS php_http_message_object_set_body(php_http_message_object_t *obj, zval *zbody TSRMLS_DC);
+ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *obj, zval *zbody TSRMLS_DC);
+ZEND_RESULT_CODE php_http_message_object_init_body_object(php_http_message_object_t *obj);
 
 zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC);
 zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg, php_http_message_object_t **ptr TSRMLS_DC);