X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=efdf053c244fba3d413a1adee177eabca0929083;hp=8a7e564a761990743270c2e7c736de49cc2471ce;hb=5560fddc86c1fbbc53ab57e885acbd5e879077a8;hpb=91894f441698c7d430d9c1233700227dbee94f0d

diff --git a/php_http_message.c b/php_http_message.c
index 8a7e564..efdf053 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -297,6 +297,9 @@ void php_http_message_update_headers(php_http_message_t *msg)
 
 	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 ((h = php_http_message_header(msg, ZEND_STRL("Content-Range"), 0))) {
+		/* don't mess around with a Content-Range message */
+		zval_ptr_dtor(&h);
 	} else if ((size = php_http_message_body_size(msg->body))) {
 		MAKE_STD_ZVAL(h);
 		ZVAL_LONG(h, size);
@@ -324,6 +327,7 @@ void php_http_message_update_headers(php_http_message_t *msg)
 
 		zval_ptr_dtor(&h);
 		if (Z_LVAL_P(h_cpy)) {
+			/* body->size == 0, so get rid of old Content-Length */
 			zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length"));
 		}
 		zval_ptr_dtor(&h_cpy);
@@ -1161,17 +1165,19 @@ static PHP_METHOD(HttpMessage, getHeader)
 			if (!header_ce) {
 				RETURN_ZVAL(header, 1, 1);
 			} else if (instanceof_function(header_ce, php_http_header_class_entry TSRMLS_CC)) {
+				php_http_object_method_t cb;
 				zval *header_name, **argv[2];
 
 				MAKE_STD_ZVAL(header_name);
 				ZVAL_STRINGL(header_name, header_str, header_len, 1);
-				Z_ADDREF_P(header);
 
 				argv[0] = &header_name;
 				argv[1] = &header;
 
 				object_init_ex(return_value, header_ce);
-				php_http_method_call(return_value, ZEND_STRL("__construct"), 2, argv, NULL TSRMLS_CC);
+				php_http_object_method_init(&cb, return_value, ZEND_STRL("__construct") TSRMLS_CC);
+				php_http_object_method_call(&cb, return_value, NULL, 2, argv TSRMLS_CC);
+				php_http_object_method_dtor(&cb);
 
 				zval_ptr_dtor(&header_name);
 				zval_ptr_dtor(&header);