diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-22 13:47:55 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-22 13:47:55 +0900 |
| commit | 26a2bed185a28c8228f72741ca2f5cc743401fb8 (patch) | |
| tree | b6f9411e43a9135d59a89f00d7cc554a46bc1aed | |
| parent | 34ad83857b1d5b40fea35d2702eb8aa4a0ce42a5 (diff) | |
| parent | 383423a1ee356b102563100e99e147ce8da996c3 (diff) | |
| download | php-git-26a2bed185a28c8228f72741ca2f5cc743401fb8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Re-fixed bug #66469
| -rw-r--r-- | ext/session/session.c | 4 | ||||
| -rw-r--r-- | ext/session/tests/bug60634.phpt | 1 | ||||
| -rw-r--r-- | ext/session/tests/bug60634_error_4.phpt | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index e16b79f585..d8b80b1f94 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1365,9 +1365,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 + |