From: Michael Wallner <mike@php.net>
Date: Mon, 13 Feb 2012 13:28:36 +0000 (+0000)
Subject: fix type initialization and leaks; fix prepend
X-Git-Tag: DEV_2-before-client~43
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bbbecc2dde9ed1a605fd97cdde99960f41b098ab;p=m6w6%2Fext-http

fix type initialization and leaks; fix prepend
---

diff --git a/php_http_message.c b/php_http_message.c
index b3adb46..7c91ac5 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -187,7 +187,7 @@ PHP_HTTP_API void php_http_message_set_type(php_http_message_t *message, php_htt
 	if (type != message->type) {
 
 		/* free request info */
-		switch (message->type = type) {
+		switch (message->type) {
 			case PHP_HTTP_REQUEST:
 				STR_FREE(message->http.info.request.method);
 				STR_FREE(message->http.info.request.url);
@@ -201,6 +201,7 @@ PHP_HTTP_API void php_http_message_set_type(php_http_message_t *message, php_htt
 				break;
 		}
 
+		message->type = type;
 		memset(&message->http, 0, sizeof(message->http));
 	}
 }
@@ -592,7 +593,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *fr
 			temp->parent = php_http_message_init(NULL, 0 TSRMLS_CC);
 			php_http_message_set_info(temp->parent, &info);
 			zend_hash_copy(&temp->parent->hdrs, &from->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-			php_http_message_body_copy(&from->body, &temp->body, 1);
+			php_http_message_body_copy(&from->parent->body, &temp->parent->body, 1);
 		
 			temp = temp->parent;
 			from = from->parent;