reintegrate the DEV_2-client branch

[m6w6/ext-http] / php_http_message.h

diff --git a/php_http_message.h b/php_http_message.h
index 8c6c554bc8cfc636e88f928958d987b926e5fc4f..c78101d12c1f5e4c7b74d1db04fa9ef5eab59ef6 100644 (file)
--- a/php_http_message.h
+++ b/php_http_message.h
@@ -59,7 +59,6 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http
 
 PHP_HTTP_API void php_http_message_serialize(php_http_message_t *message, char **string, size_t *length);
 PHP_HTTP_API php_http_message_t *php_http_message_reverse(php_http_message_t *msg);
-PHP_HTTP_API php_http_message_t *php_http_message_interconnect(php_http_message_t *m1, php_http_message_t *m2);
 
 #define php_http_message_count(c, m) \
 { \
@@ -95,6 +94,7 @@ extern void php_http_message_object_free(void *object TSRMLS_DC);
 PHP_METHOD(HttpMessage, __construct);
 PHP_METHOD(HttpMessage, getBody);
 PHP_METHOD(HttpMessage, setBody);
+PHP_METHOD(HttpMessage, addBody);
 PHP_METHOD(HttpMessage, getHeader);
 PHP_METHOD(HttpMessage, setHeader);
 PHP_METHOD(HttpMessage, addHeader);
@@ -119,7 +119,8 @@ PHP_METHOD(HttpMessage, guessContentType);
 PHP_METHOD(HttpMessage, getParentMessage);
 PHP_METHOD(HttpMessage, send);
 PHP_METHOD(HttpMessage, toString);
-PHP_METHOD(HttpMessage, toMessageTypeObject);
+PHP_METHOD(HttpMessage, toStream);
+PHP_METHOD(HttpMessage, toCallback);
 
 PHP_METHOD(HttpMessage, count);
 PHP_METHOD(HttpMessage, serialize);