From: Michael Wallner <mike@php.net>
Date: Thu, 9 Sep 2010 12:45:57 +0000 (+0000)
Subject: ensure the merged header IS_STRING
X-Git-Tag: DEV_2-before-client~136
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=db050ba01b0335e979fea76184d4692fe00ac53a;p=m6w6%2Fext-http

ensure the merged header IS_STRING
---

diff --git a/php_http_message.c b/php_http_message.c
index c1c82e9..da0ac7d 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -158,7 +158,9 @@ PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_st
 			php_http_buffer_init(&str);
 			MAKE_STD_ZVAL(header_str);
 			FOREACH_VAL(pos, *header, val) {
-				php_http_buffer_appendf(&str, PHP_HTTP_BUFFER_LEN(&str) ? ", %s":"%s", Z_STRVAL_PP(val));
+				zval *strval = php_http_zsep(IS_STRING, *val);
+				php_http_buffer_appendf(&str, PHP_HTTP_BUFFER_LEN(&str) ? ", %s":"%s", Z_STRVAL_P(strval));
+				zval_ptr_dtor(&strval);
 			}
 			php_http_buffer_fix(&str);
 			ZVAL_STRINGL(header_str, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str), 0);