com php-src: Re-fixed bug #66469: ext/session/session.c ext/session/tests/bug60634.phpt ext/session/tests/bug606 34_error_4.phpt

Commit: 383423a1ee356b102563100e99e147ce8da996c3 Author: Yasuo Ohgaki <yohgaki@php.net> Wed, 22 Jan 2014 13:46:59 +0900 Parents: eb6d1fcd3c592aba0a6fe8527dc3621fbf521aa0 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=383423a1ee356b102563100e99e147ce8da996c3 Log: Re-fixed bug #66469 Bugs: https://bugs.php.net/66469 Changed paths: M ext/session/session.c M ext/session/tests/bug60634.phpt M ext/session/tests/bug60634_error_4..phpt Diff: diff --git a/ext/session/session.c b/ext/session/session.c index 90d6ba7..b1fcd3a 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 e2dfd15...86dcb11 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 f21d077..d0b5786 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 +