Do not send X-Powered-By if headers sent (#9039)

bukka · ericnorris · web-flow · commit 922371f3b130 · 2022-07-18T18:01:05.000+01:00
Co-authored-by: Eric Norris &lt;erictnorris@gmail.com&gt;
diff --git a/main/main.c b/main/main.c
@@ -1756,7 +1756,7 @@ zend_result php_request_startup(void)
 			CWDG(realpath_cache_size_limit) = 0;
 		}
 
-		if (PG(expose_php)) {
+		if (PG(expose_php) && !SG(headers_sent)) {
 			sapi_add_header(SAPI_PHP_VERSION_HEADER, sizeof(SAPI_PHP_VERSION_HEADER)-1, 1);
 		}
 
diff --git a/sapi/cgi/tests/bug69487.phpt b/sapi/cgi/tests/bug69487.phpt
@@ -14,7 +14,5 @@ var_dump(strlen(file_get_contents('php://input')));
 Warning: Unknown: Unable to create temporary file, Check permissions in temporary files directory. in Unknown on line 0
 
 Warning: Unknown: POST data can't be buffered; all data discarded in Unknown on line 0
-
-Warning: Cannot modify header information - headers already sent in Unknown on line 0
 bool(false)
 int(0)
diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt
@@ -13,8 +13,6 @@ var_dump($_POST, $HTTP_RAW_POST_DATA);
 --EXPECTF--
 Warning: Unknown: POST Content-Length of 2050 bytes exceeds the limit of 1024 bytes in Unknown on line 0
 
-Warning: Cannot modify header information - headers already sent in Unknown on line 0
-
 Warning: Undefined variable $HTTP_RAW_POST_DATA in %s on line %d
 array(0) {
 }

Original file line number	Diff line number	Diff line change
`@@ -1756,7 +1756,7 @@ zend_result php_request_startup(void)`
`1756`	`1756`	`CWDG(realpath_cache_size_limit) = 0;`
`1757`	`1757`	`}`
`1758`	`1758`
`1759`		`- if (PG(expose_php)) {`
	`1759`	`+ if (PG(expose_php) && !SG(headers_sent)) {`
`1760`	`1760`	`sapi_add_header(SAPI_PHP_VERSION_HEADER, sizeof(SAPI_PHP_VERSION_HEADER)-1, 1);`
`1761`	`1761`	`}`
`1762`	`1762`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ var_dump($_POST, $HTTP_RAW_POST_DATA);`
`13`	`13`	`--EXPECTF--`
`14`	`14`	`Warning: Unknown: POST Content-Length of 2050 bytes exceeds the limit of 1024 bytes in Unknown on line 0`
`15`	`15`
`16`		`-Warning: Cannot modify header information - headers already sent in Unknown on line 0`
`17`		`-`
`18`	`16`	`Warning: Undefined variable $HTTP_RAW_POST_DATA in %s on line %d`
`19`	`17`	`array(0) {`
`20`	`18`	`}`