Re-fixed bug #66469

Yasuo Ohgaki · Yasuo Ohgaki · commit 383423a1ee35 · 2014-01-22T13:46:59.000+09:00
diff --git 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
@@ -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
@@ -49,3 +49,4 @@ Stack trace:
 #1 {main}
   thrown in %s on line %d
 close: goodbye cruel world
+

Original file line number	Diff line number	Diff line change
`@@ -1343,9 +1343,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */`
`1343`	`1343`
`1344`	`1344`	`smart_str_0(&ncookie);`
`1345`	`1345`
`1346`		`- /* 'replace' must be 0 here, else a previous Set-Cookie`
`1347`		`- header, probably sent with setcookie() will be replaced! */`
`1348`		`- sapi_add_header_ex(ncookie.c, ncookie.len, 0, 0 TSRMLS_CC);`
	`1346`	`+ sapi_add_header_ex(ncookie.c, ncookie.len, 0, 1 TSRMLS_CC);`
`1349`	`1347`	`}`
`1350`	`1348`	`/* }}} */`
`1351`	`1349`