Re-fixed bug #66469

diff --git a/ext/session/session.c b/ext/session/session.c
index 90d6ba7447cbb45ddf56188eabc1909263142f07..b1fcd3a2396f28cc7ba3d63031010736b482fc99 100644 (file)
--- 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 e2dfd15b37a870907b8298b4ba79830a63da9dd2..86dcb115268c410afc3c8a401c0bc60b22a1acc2 100644 (file)
--- 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 f21d077b54f10c33b367a1c24f4bff85a286fefc..d0b5786af9a382c4da663991c553537184dd06f3 100644 (file)
--- 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
+