X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=39f857d5d7c280d30f140311d94f965190384f6a;hp=912de7014b8fd87b3cbaa32894b6de483fcc927c;hb=25f0c16244fc5f8b2c9d9bfddab8a541d2521789;hpb=628bdcb6edd65cb683b43af16cd0ce619b56d58a

diff --git a/php_http_message.c b/php_http_message.c
index 912de70..39f857d 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -20,7 +20,7 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa
 	php_http_message_t *old = *message;
 
 	/* advance message */
-	if (!old || old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
+	if (!old || old->type || zend_hash_num_elements(&old->hdrs)) {
 		(*message) = php_http_message_init(NULL, 0 TSRMLS_CC);
 		(*message)->parent = old;
 		if (headers) {
@@ -277,9 +277,10 @@ PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg)
 {
 	zval *h;
 	size_t size;
-	TSRMLS_FETCH_FROM_CTX(msg->ts);
 
-	if ((size = php_http_message_body_size(&msg->body))) {
+	if (php_http_message_body_stream(&msg->body)->readfilters.head) {
+		/* if a read stream filter is attached to the body the caller must also care for the headers */
+	} else if ((size = php_http_message_body_size(&msg->body))) {
 		MAKE_STD_ZVAL(h);
 		ZVAL_LONG(h, size);
 		zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL);
@@ -321,11 +322,11 @@ static zval *message_header_strval(zval **header TSRMLS_DC)
 		FOREACH_VAL(pos, *header, val) {
 			zval *strval = message_header_strval(val TSRMLS_CC);
 
-			php_http_buffer_appendf(&str, PHP_HTTP_BUFFER_LEN(&str) ? ", %s":"%s", Z_STRVAL_P(strval));
+			php_http_buffer_appendf(&str, str.used ? ", %s":"%s", Z_STRVAL_P(strval));
 			zval_ptr_dtor(&strval);
 		}
 		php_http_buffer_fix(&str);
-		ZVAL_STRINGL(ret, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str), 0);
+		ZVAL_STRINGL(ret, str.data, str.used, 0);
 	} else  {
 		ret = php_http_zsep(1, IS_STRING, *header);
 	}
@@ -397,7 +398,7 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http
 
 	php_http_buffer_init_ex(&str, 0x1000, 0);
 	message_headers(msg, &str);
-	cb(cb_arg, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str));
+	cb(cb_arg, str.data, str.used);
 	php_http_buffer_dtor(&str);
 
 	if (php_http_message_body_size(&msg->body)) {
@@ -873,11 +874,14 @@ static void php_http_message_object_prophandler_get_parent_message(php_http_mess
 }
 static void php_http_message_object_prophandler_set_parent_message(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
 	if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_class_entry TSRMLS_CC)) {
+		php_http_message_object_t *parent_obj = zend_object_store_get_object(value TSRMLS_CC);
+
 		if (obj->message->parent) {
 			zend_objects_store_del_ref_by_handle(obj->parent.handle TSRMLS_CC);
 		}
 		Z_OBJ_ADDREF_P(value);
 		obj->parent = Z_OBJVAL_P(value);
+		obj->message->parent = parent_obj->message;
 	}
 }
 
@@ -897,7 +901,7 @@ PHP_MINIT_FUNCTION(http_message)
 	zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1);
 	zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
 	php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type);
-	zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("body"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
+	zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED TSRMLS_CC);
 	php_http_message_object_add_prophandler(ZEND_STRL("body"), php_http_message_object_prophandler_get_body, php_http_message_object_prophandler_set_body);
 	zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
 	php_http_message_object_add_prophandler(ZEND_STRL("requestMethod"), php_http_message_object_prophandler_get_request_method, php_http_message_object_prophandler_set_request_method);
@@ -1368,10 +1372,10 @@ PHP_METHOD(HttpMessage, addBody)
 	zval *new_body;
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &new_body, php_http_message_body_get_class_entry())) {
-		php_http_message_body_object_t *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 		php_http_message_body_object_t *new_obj = zend_object_store_get_object(new_body TSRMLS_CC);
 
-		php_http_message_body_to_callback(old_obj->body, (php_http_pass_callback_t) php_http_message_body_append, new_obj->body, 0, 0);
+		php_http_message_body_to_callback(new_obj->body, (php_http_pass_callback_t) php_http_message_body_append, &obj->message->body, 0, 0);
 	}
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -1474,6 +1478,7 @@ PHP_METHOD(HttpMessage, addHeader)
 		if ((header = php_http_message_header(obj->message, name, name_len, 0))) {
 			convert_to_array(header);
 			zend_hash_next_index_insert(Z_ARRVAL_P(header), &zvalue, sizeof(void *), NULL);
+			zval_ptr_dtor(&header);
 		} else {
 			zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL);
 		}