X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=9432ae953f7c7a8fd5e2bce46401fd080f207628;hp=f3509a4b40b8c18682c0cb5261236349fb8dff65;hb=d7f91cdeb926694858b07d77e29e10d5617112b1;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e

diff --git a/php_http_message.c b/php_http_message.c
index f3509a4..9432ae9 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -300,6 +300,14 @@ void php_http_message_update_headers(php_http_message_t *msg)
 				zval_ptr_dtor(&h);
 			}
 		}
+	} else if ((h = php_http_message_header(msg, ZEND_STRL("Content-Length"), 1))) {
+		zval *h_cpy = php_http_ztyp(IS_LONG, h);
+
+		zval_ptr_dtor(&h);
+		if (Z_LVAL_P(h_cpy)) {
+			zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
+		}
+		zval_ptr_dtor(&h_cpy);
 	}
 }
 
@@ -764,7 +772,9 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval
 	}
 
 	body_obj = zend_object_store_get_object(zbody TSRMLS_CC);
-
+	if (!body_obj->body) {
+		body_obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC);
+	}
 	if (msg_obj->body) {
 		zend_objects_store_del_ref_by_handle(msg_obj->body->zv.handle TSRMLS_CC);
 	}
@@ -782,6 +792,14 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval
 	return SUCCESS;
 }
 
+STATUS php_http_message_object_init_body_object(php_http_message_object_t *obj)
+{
+	TSRMLS_FETCH_FROM_CTX(obj->message->ts);
+
+	php_http_message_body_addref(obj->message->body);
+	return php_http_new(NULL, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body, (void *) &obj->body TSRMLS_CC);
+}
+
 zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC)
 {
 	return php_http_message_object_new_ex(ce, NULL, NULL TSRMLS_CC);
@@ -1050,8 +1068,8 @@ static PHP_METHOD(HttpMessage, getBody)
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 
 	if (!obj->body) {
-		php_http_message_body_addref(obj->message->body);
-		php_http_new(NULL, php_http_message_body_class_entry, (php_http_new_t) php_http_message_body_object_new_ex, NULL, obj->message->body, (void *) &obj->body TSRMLS_CC);
+		php_http_message_object_init_body_object(obj);
+
 	}
 	if (obj->body) {
 		RETVAL_OBJVAL(obj->body->zv, 1);
@@ -1800,7 +1818,9 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessage_count, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpMessage, count)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
+	long count_mode = -1;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &count_mode)) {
 		long i = 0;
 		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);