X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cookie.c;h=4bd8d80224606f7464a4470250da56d2eb1c07e1;hp=1234e38708a962386a1558df575966c91fee1da6;hb=d7f91cdeb926694858b07d77e29e10d5617112b1;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e

diff --git a/php_http_cookie.c b/php_http_cookie.c
index 1234e38..4bd8d80 100644
--- a/php_http_cookie.c
+++ b/php_http_cookie.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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -526,7 +526,7 @@ static PHP_METHOD(HttpCookie, setCookies)
 
 	zend_hash_clean(&obj->list->cookies);
 	if (cookies) {
-		array_copy(cookies, &obj->list->cookies);
+		array_copy_strings(cookies, &obj->list->cookies);
 	}
 
 	RETVAL_ZVAL(getThis(), 1, 0);
@@ -546,7 +546,7 @@ static PHP_METHOD(HttpCookie, addCookies)
 
 	PHP_HTTP_COOKIE_OBJECT_INIT(obj);
 
-	array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY);
+	array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY|ARRAY_JOIN_STRINGIFY);
 
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -585,7 +585,7 @@ static PHP_METHOD(HttpCookie, setExtras)
 
 	zend_hash_clean(&obj->list->extras);
 	if (extras) {
-		array_copy(extras, &obj->list->extras);
+		array_copy_strings(extras, &obj->list->extras);
 	}
 
 	RETVAL_ZVAL(getThis(), 1, 0);
@@ -605,7 +605,7 @@ static PHP_METHOD(HttpCookie, addExtras)
 
 	PHP_HTTP_COOKIE_OBJECT_INIT(obj);
 
-	array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY);
+	array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY|ARRAY_JOIN_STRINGIFY);
 
 	RETVAL_ZVAL(getThis(), 1, 0);
 }