Merge branch 'PHP-5.6'

Yasuo Ohgaki · Yasuo Ohgaki · commit 9cefeea8605a · 2014-01-22T13:49:13.000+09:00
* PHP-5.6:
  Re-fixed bug #66469
diff --git 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
@@ -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
`@@ -1365,9 +1365,7 @@ static void php_session_send_cookie(TSRMLS_D) /* {{{ */`
`1365`	`1365`
`1366`	`1366`	`smart_str_0(&ncookie);`
`1367`	`1367`
`1368`		`- /* 'replace' must be 0 here, else a previous Set-Cookie`
`1369`		`- header, probably sent with setcookie() will be replaced! */`
`1370`		`- sapi_add_header_ex(ncookie.c, ncookie.len, 0, 0 TSRMLS_CC);`
	`1368`	`+ sapi_add_header_ex(ncookie.c, ncookie.len, 0, 1 TSRMLS_CC);`
`1371`	`1369`	`}`
`1372`	`1370`	`/* }}} */`
`1373`	`1371`