From ca4ac2b277ade9cabe3d96d1629ccf1812042949 Mon Sep 17 00:00:00 2001
From: Dominic H <git@dominic.me.uk>
Date: Thu, 8 Sep 2022 12:16:51 +0100
Subject: [PATCH] Prevent FPM tests from failing due to expose_php

If a php.ini is installed in $PREFIX containing expose_php = off,
a number of FPM tests fail due to a missing-but-expected
X-Powered-By header. This change injects an "expose_php = on"
into the fpm pool config.
---
 sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt         | 1 +
 sapi/fpm/tests/bug68421-ipv6-access-log.phpt            | 1 +
 sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt         | 3 +++
 sapi/fpm/tests/bug68442-signal-reload.phpt              | 1 +
 sapi/fpm/tests/bug72185-fcgi-empty-frame.phpt           | 1 +
 sapi/fpm/tests/bug72573-http-proxy.phpt                 | 1 +
 sapi/fpm/tests/bug73342-nonblocking-stdio.phpt          | 1 +
 sapi/fpm/tests/bug74083-concurrent-reload.phpt          | 1 +
 sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt      | 1 +
 sapi/fpm/tests/bug77934-reload-process-control.phpt     | 1 +
 sapi/fpm/tests/bug78599-path-info-underflow.phpt        | 1 +
 sapi/fpm/tests/fastcgi_finish_request_basic.phpt        | 1 +
 sapi/fpm/tests/fpm_get_status_basic.phpt                | 1 +
 sapi/fpm/tests/getallheaders.phpt                       | 1 +
 sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt        | 1 +
 sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt        | 1 +
 sapi/fpm/tests/log-bm-in-shutdown-fn.phpt               | 1 +
 sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt            | 1 +
 sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt          | 1 +
 sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt         | 1 +
 sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt         | 1 +
 sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt         | 1 +
 sapi/fpm/tests/log-bwd-msg-with-nl.phpt                 | 1 +
 sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 1 +
 sapi/fpm/tests/log-bwd-multiple-msgs.phpt               | 1 +
 sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt          | 1 +
 sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt         | 1 +
 sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt    | 1 +
 sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt        | 1 +
 sapi/fpm/tests/log-bwp-realloc-buffer.phpt              | 1 +
 sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt         | 1 +
 sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt         | 1 +
 sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt         | 1 +
 sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt         | 1 +
 sapi/fpm/tests/log-suppress-output-request-body.phpt    | 1 +
 sapi/fpm/tests/log-suppress-output.phpt                 | 2 ++
 sapi/fpm/tests/main-global-prefix.phpt                  | 1 +
 sapi/fpm/tests/php-admin-doc-root.phpt                  | 1 +
 sapi/fpm/tests/pm-max-spawn-rate-run.phpt               | 1 +
 sapi/fpm/tests/pool-prefix.phpt                         | 1 +
 sapi/fpm/tests/socket-uds-basic.phpt                    | 1 +
 sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt     | 1 +
 sapi/fpm/tests/status-basic.phpt                        | 1 +
 sapi/fpm/tests/status-listen.phpt                       | 1 +
 44 files changed, 47 insertions(+)

diff --git a/sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt b/sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt
index 9a4692d17c16a..678f70beba5a5 100644
--- a/sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt
+++ b/sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt
@@ -21,6 +21,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/bug68421-ipv6-access-log.phpt b/sapi/fpm/tests/bug68421-ipv6-access-log.phpt
index 80c115c17f910..29301345c1f45 100644
--- a/sapi/fpm/tests/bug68421-ipv6-access-log.phpt
+++ b/sapi/fpm/tests/bug68421-ipv6-access-log.phpt
@@ -23,6 +23,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt b/sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt
index ae6b48351a03e..debea3daaa18e 100644
--- a/sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt
+++ b/sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 [pool_ondemand]
 listen = {{ADDR[ondemand]}}
 ping.path = /ping
@@ -26,12 +27,14 @@ ping.response = pong-on-demand
 pm = ondemand
 pm.max_children = 2
 pm.process_idle_timeout = 10
+php_flag[expose_php] = on
 [pool_static]
 listen = {{ADDR[static]}}
 ping.path = /ping
 ping.response = pong-static
 pm = static
 pm.max_children = 2
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/bug68442-signal-reload.phpt b/sapi/fpm/tests/bug68442-signal-reload.phpt
index d15c8e14e765c..fe4f92c2e5409 100644
--- a/sapi/fpm/tests/bug68442-signal-reload.phpt
+++ b/sapi/fpm/tests/bug68442-signal-reload.phpt
@@ -20,6 +20,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/bug72185-fcgi-empty-frame.phpt b/sapi/fpm/tests/bug72185-fcgi-empty-frame.phpt
index 7c4b4468e3597..b36f8584d2536 100644
--- a/sapi/fpm/tests/bug72185-fcgi-empty-frame.phpt
+++ b/sapi/fpm/tests/bug72185-fcgi-empty-frame.phpt
@@ -20,6 +20,7 @@ pm.max_spare_servers = 2
 catch_workers_output = yes
 decorate_workers_output = no
 php_value[html_errors] = false
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<'EOT'
diff --git a/sapi/fpm/tests/bug72573-http-proxy.phpt b/sapi/fpm/tests/bug72573-http-proxy.phpt
index ffa60d97134e8..62b626ac02620 100644
--- a/sapi/fpm/tests/bug72573-http-proxy.phpt
+++ b/sapi/fpm/tests/bug72573-http-proxy.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt b/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt
index 3cf44d11ffabc..cd1e9c0c0eb7f 100644
--- a/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt
+++ b/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/bug74083-concurrent-reload.phpt b/sapi/fpm/tests/bug74083-concurrent-reload.phpt
index 8b4b690e96201..142d3dfcccbdf 100644
--- a/sapi/fpm/tests/bug74083-concurrent-reload.phpt
+++ b/sapi/fpm/tests/bug74083-concurrent-reload.phpt
@@ -24,6 +24,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 1
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt b/sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt
index fd8e1b8887e32..7c1027316e106 100644
--- a/sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt
+++ b/sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 php_admin_value[memory_limit]=32M
 php_value[date.timezone]=Europe/London
 EOT;
diff --git a/sapi/fpm/tests/bug77934-reload-process-control.phpt b/sapi/fpm/tests/bug77934-reload-process-control.phpt
index e7da04421bd9f..df87ee75532c2 100644
--- a/sapi/fpm/tests/bug77934-reload-process-control.phpt
+++ b/sapi/fpm/tests/bug77934-reload-process-control.phpt
@@ -21,6 +21,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 1
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/bug78599-path-info-underflow.phpt b/sapi/fpm/tests/bug78599-path-info-underflow.phpt
index edd4e0d496998..18f99d0601b3d 100644
--- a/sapi/fpm/tests/bug78599-path-info-underflow.phpt
+++ b/sapi/fpm/tests/bug78599-path-info-underflow.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/fastcgi_finish_request_basic.phpt b/sapi/fpm/tests/fastcgi_finish_request_basic.phpt
index 939782fa312d7..0821f479a23f0 100644
--- a/sapi/fpm/tests/fastcgi_finish_request_basic.phpt
+++ b/sapi/fpm/tests/fastcgi_finish_request_basic.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/fpm_get_status_basic.phpt b/sapi/fpm/tests/fpm_get_status_basic.phpt
index d72a1f4d70aca..998796f96a158 100644
--- a/sapi/fpm/tests/fpm_get_status_basic.phpt
+++ b/sapi/fpm/tests/fpm_get_status_basic.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt
index 90ecae3e449af..1b493b32c8f93 100644
--- a/sapi/fpm/tests/getallheaders.phpt
+++ b/sapi/fpm/tests/getallheaders.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $code = <<<EOT
diff --git a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
index 4ff8d0660936e..514ecf2108710 100644
--- a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
+++ b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
@@ -24,6 +24,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 // php-fpm must not be launched with --force-stderr option
diff --git a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
index 68d9f6fa68b64..79a1a5e41bafb 100644
--- a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
+++ b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
@@ -24,6 +24,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 // php-fpm must not be launched with --force-stderr option
diff --git a/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt b/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt
index f968bf9f08bcf..552a434b3086e 100644
--- a/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt
+++ b/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt b/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt
index 940d0df6e9abd..876a480181508 100644
--- a/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt
+++ b/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt b/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt
index 5354671ee2a70..9d59ca04abe3b 100644
--- a/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt
+++ b/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt b/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt
index 65524287459dd..e6ecd8af204ab 100644
--- a/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt
+++ b/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = yes
 EOT;
diff --git a/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt b/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt
index c528804292737..87c79124e7e9d 100644
--- a/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt
+++ b/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt b/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt
index fc8fbe1fe8ea1..6e588b8610865 100644
--- a/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt
+++ b/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt
index 0fdaf105493e6..b8f34b0f126bd 100644
--- a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt
+++ b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
index 4a8fbf3a56e25..69a54eaede9e0 100644
--- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
+++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt
index d328aff9db243..ac26959ac0e7e 100644
--- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt
+++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt b/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt
index 5a62285eda9dd..5f5b4b45ca668 100644
--- a/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt
+++ b/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = no
 EOT;
diff --git a/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt b/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt
index 10674935cce9a..aca8eca96202b 100644
--- a/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt
+++ b/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = no
 EOT;
diff --git a/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt b/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt
index 01b00d44853b4..6811785baa2a8 100644
--- a/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt
+++ b/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = no
 EOT;
diff --git a/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt b/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt
index 63b2555de76ed..bd19a09c453f9 100644
--- a/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt
+++ b/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = no
 EOT;
diff --git a/sapi/fpm/tests/log-bwp-realloc-buffer.phpt b/sapi/fpm/tests/log-bwp-realloc-buffer.phpt
index 3371bf8330c88..8bf4b487eda06 100644
--- a/sapi/fpm/tests/log-bwp-realloc-buffer.phpt
+++ b/sapi/fpm/tests/log-bwp-realloc-buffer.phpt
@@ -17,6 +17,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = no
 EOT;
diff --git a/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt b/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt
index 5162206cdd03f..0f67198f1c612 100644
--- a/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt
+++ b/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = yes
 EOT;
diff --git a/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt b/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt
index fe08be6d3cbad..1ffb1f54498aa 100644
--- a/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt
+++ b/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt b/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt
index 351473fc2cfa8..c150bcc3c2197 100644
--- a/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt
+++ b/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 EOT;
 
diff --git a/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt b/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt
index 61cb92331ebb4..683d7077ba1a2 100644
--- a/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt
+++ b/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 catch_workers_output = yes
 decorate_workers_output = no
 EOT;
diff --git a/sapi/fpm/tests/log-suppress-output-request-body.phpt b/sapi/fpm/tests/log-suppress-output-request-body.phpt
index c878b40f964cb..3528d746b91f4 100644
--- a/sapi/fpm/tests/log-suppress-output-request-body.phpt
+++ b/sapi/fpm/tests/log-suppress-output-request-body.phpt
@@ -39,6 +39,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg, $testScript);
diff --git a/sapi/fpm/tests/log-suppress-output.phpt b/sapi/fpm/tests/log-suppress-output.phpt
index 5a5e7bb9544ba..a385010697d39 100644
--- a/sapi/fpm/tests/log-suppress-output.phpt
+++ b/sapi/fpm/tests/log-suppress-output.phpt
@@ -78,6 +78,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $prefix = __DIR__;
@@ -105,6 +106,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 $tester->reload($cfg);
 $tester->expectLogReloadingNotices();
diff --git a/sapi/fpm/tests/main-global-prefix.phpt b/sapi/fpm/tests/main-global-prefix.phpt
index 44486e4ed3288..4fcf9ef55acc8 100644
--- a/sapi/fpm/tests/main-global-prefix.phpt
+++ b/sapi/fpm/tests/main-global-prefix.phpt
@@ -23,6 +23,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $prefix = __DIR__;
diff --git a/sapi/fpm/tests/php-admin-doc-root.phpt b/sapi/fpm/tests/php-admin-doc-root.phpt
index a078c3aa25267..f1adbf2d1a321 100644
--- a/sapi/fpm/tests/php-admin-doc-root.phpt
+++ b/sapi/fpm/tests/php-admin-doc-root.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 php_admin_value[doc_root] = $docRoot
 EOT;
 
diff --git a/sapi/fpm/tests/pm-max-spawn-rate-run.phpt b/sapi/fpm/tests/pm-max-spawn-rate-run.phpt
index ca128b4675127..7950a6956f790 100644
--- a/sapi/fpm/tests/pm-max-spawn-rate-run.phpt
+++ b/sapi/fpm/tests/pm-max-spawn-rate-run.phpt
@@ -23,6 +23,7 @@ pm.max_spare_servers = 3
 pm.max_spawn_rate = 64
 ping.path = /ping
 ping.response = pong
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/pool-prefix.phpt b/sapi/fpm/tests/pool-prefix.phpt
index d128c232879f4..10281fa8cb534 100644
--- a/sapi/fpm/tests/pool-prefix.phpt
+++ b/sapi/fpm/tests/pool-prefix.phpt
@@ -28,6 +28,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/socket-uds-basic.phpt b/sapi/fpm/tests/socket-uds-basic.phpt
index b22f3384f9d6b..bf189fc668872 100644
--- a/sapi/fpm/tests/socket-uds-basic.phpt
+++ b/sapi/fpm/tests/socket-uds-basic.phpt
@@ -19,6 +19,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
index 885fd4d075076..1a14b1164760d 100644
--- a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
+++ b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
@@ -26,6 +26,7 @@ pm.max_children = 5
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
+php_flag[expose_php] = on
 EOT;
 
 $tester = new FPM\Tester($cfg);
diff --git a/sapi/fpm/tests/status-basic.phpt b/sapi/fpm/tests/status-basic.phpt
index 245fc425ca319..1aea2c101a3af 100644
--- a/sapi/fpm/tests/status-basic.phpt
+++ b/sapi/fpm/tests/status-basic.phpt
@@ -15,6 +15,7 @@ listen = {{ADDR}}
 pm = static
 pm.max_children = 1
 pm.status_path = /status
+php_flag[expose_php] = on
 EOT;
 
 $expectedStatusData = [
diff --git a/sapi/fpm/tests/status-listen.phpt b/sapi/fpm/tests/status-listen.phpt
index c6476c0332052..beb956e10f65c 100644
--- a/sapi/fpm/tests/status-listen.phpt
+++ b/sapi/fpm/tests/status-listen.phpt
@@ -16,6 +16,7 @@ pm = static
 pm.max_children = 1
 pm.status_listen = {{ADDR[status]}}
 pm.status_path = /status
+php_flag[expose_php] = on
 EOT;
 
 $expectedStatusData = [