From c6e72940d1b77a36c934828edb0e780819fd315d Mon Sep 17 00:00:00 2001 From: Eric Norris Date: Sat, 26 Oct 2019 12:34:43 -0400 Subject: [PATCH] Do not send X-Powered-By if headers sent --- main/main.c | 2 +- sapi/cgi/tests/bug69487.phpt | 2 -- tests/basic/025.phpt | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/main/main.c b/main/main.c index b1b4912369819..933ab031dd8b5 100644 --- 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 index 3ac3796826127..59058809adf29 100644 --- 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 index 5bc7bbdb8e9ad..0d00afa36271b 100644 --- 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) { }