Skip to content

Prevent FPM tests from failing due to expose_php #9508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Prevent FPM tests from failing due to expose_php #9508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug68421-ipv6-access-log.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,22 @@ 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
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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug68442-signal-reload.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug72185-fcgi-empty-frame.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug72573-http-proxy.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug73342-nonblocking-stdio.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug74083-concurrent-reload.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug77934-reload-process-control.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug78599-path-info-underflow.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/fastcgi_finish_request_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/fpm_get_status_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/getallheaders.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bm-in-shutdown-fn.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwd-msg-with-nl.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwd-multiple-msgs.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-bwp-realloc-buffer.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/log-suppress-output-request-body.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-suppress-output.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__;
Expand Down Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/main-global-prefix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__;
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/php-admin-doc-root.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/pm-max-spawn-rate-run.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/pool-prefix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/socket-uds-basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/status-basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ listen = {{ADDR}}
pm = static
pm.max_children = 1
pm.status_path = /status
php_flag[expose_php] = on
EOT;

$expectedStatusData = [
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/status-listen.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down