php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Re-fixed bug #66469
This commit is contained in:
Yasuo Ohgaki
2014-01-22 13:47:55 +09:00
parent 34ad83857b 383423a1ee
commit 26a2bed185
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/session/session.c
View File

@@ -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);
}
/* }}} */

1
ext/session/tests/bug60634.phpt
View File

@@ -43,3 +43,4 @@ echo "um, hi\n";
--EXPECTF--
write: goodbye cruel world
close: goodbye cruel world

1
ext/session/tests/bug60634_error_4.phpt
View File

@@ -49,3 +49,4 @@ Stack trace:
#1 {main}
thrown in %s on line %d
close: goodbye cruel world