X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.h;h=e45cabf4b42473273500ab40fef3aedd73fe0399;hp=fb991f5e1428e09d2d55260e40b5fd03af3e075b;hb=f753226f1f45e10ef3916256ec1bc0416c8644a8;hpb=5913db177b07398233cb00d2357aba595eab8371

diff --git a/php_http_message.h b/php_http_message.h
index fb991f5..e45cabf 100644
--- a/php_http_message.h
+++ b/php_http_message.h
@@ -30,7 +30,7 @@ typedef struct php_http_message php_http_message_t;
 struct php_http_message {
 	PHP_HTTP_INFO_IMPL(http, type)
 	HashTable hdrs;
-	php_http_message_body_t body;
+	php_http_message_body_t *body;
 	php_http_message_t *parent;
 	void *opaque;
 #ifdef ZTS
@@ -40,7 +40,7 @@ struct php_http_message {
 
 PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info TSRMLS_DC);
 
-PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *m, php_http_message_type_t t TSRMLS_DC);
+PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *m, php_http_message_type_t t, php_http_message_body_t *body TSRMLS_DC);
 PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m, php_http_message_type_t t TSRMLS_DC);
 PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to);
 PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_message_t *to, zend_bool parents);
@@ -52,7 +52,7 @@ PHP_HTTP_API void php_http_message_set_info(php_http_message_t *message, php_htt
 
 PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg);
 
-PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_str, size_t key_len, int join);
+PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len, int join);
 PHP_HTTP_API zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary);
 
 PHP_HTTP_API void php_http_message_to_string(php_http_message_t *msg, char **string, size_t *length);
@@ -61,6 +61,7 @@ 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_zip(php_http_message_t *one, php_http_message_t *two);
 
 #define php_http_message_count(c, m) \
 { \
@@ -68,12 +69,13 @@ PHP_HTTP_API php_http_message_t *php_http_message_reverse(php_http_message_t *ms
 	for (c = 0; __tmp_msg; __tmp_msg = __tmp_msg->parent, ++(c)); \
 }
 
-PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len TSRMLS_DC);
+PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy TSRMLS_DC);
 
 /* PHP */
 
 typedef struct php_http_message_object {
 	zend_object zo;
+	zend_object_value zv;
 	php_http_message_t *message;
 	zend_object_value parent, body;
 	zval *iterator;