From: Yasuo Ohgaki <yohgaki@php.net>
Date: Wed, 22 Jan 2014 04:46:59 +0000 (+0900)
Subject: Re-fixed bug #66469
X-Git-Tag: php-5.5.9RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=383423a1ee356b102563100e99e147ce8da996c3;p=php

Re-fixed bug #66469
---

diff --git a/ext/session/session.c b/ext/session/session.c
index 90d6ba7447..b1fcd3a239 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1343,9 +1343,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */
 
 	smart_str_0(&ncookie);
 
-	/*	'replace' must be 0 here, else a previous Set-Cookie
-		header, probably sent with setcookie() will be replaced! */
-	sapi_add_header_ex(ncookie.c, ncookie.len, 0, 0 TSRMLS_CC);
+	sapi_add_header_ex(ncookie.c, ncookie.len, 0, 1 TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/ext/session/tests/bug60634.phpt b/ext/session/tests/bug60634.phpt
index e2dfd15b37..86dcb11526 100644
--- a/ext/session/tests/bug60634.phpt
+++ b/ext/session/tests/bug60634.phpt
@@ -43,3 +43,4 @@ echo "um, hi\n";
 --EXPECTF--
 write: goodbye cruel world
 close: goodbye cruel world
+
diff --git a/ext/session/tests/bug60634_error_4.phpt b/ext/session/tests/bug60634_error_4.phpt
index f21d077b54..d0b5786af9 100644
--- a/ext/session/tests/bug60634_error_4.phpt
+++ b/ext/session/tests/bug60634_error_4.phpt
@@ -49,3 +49,4 @@ Stack trace:
 #1 {main}
   thrown in %s on line %d
 close: goodbye cruel world
+