diff --git a/sapi/fpm/tests/bug68381-log-level-warning.phpt b/sapi/fpm/tests/bug68381-log-level-warning.phpt index b9066cd05164..1f7c10afb2d4 100644 --- a/sapi/fpm/tests/bug68381-log-level-warning.phpt +++ b/sapi/fpm/tests/bug68381-log-level-warning.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug68381 - Log messages with warning level only +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt b/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt index 0998cf0acafc..27f643792f1a 100644 --- a/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt +++ b/sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug68428 - IPv6 allowed client only +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug68458-pm-no-start-server.phpt b/sapi/fpm/tests/bug68458-pm-no-start-server.phpt index c0c69b64b997..521bcec8b956 100644 --- a/sapi/fpm/tests/bug68458-pm-no-start-server.phpt +++ b/sapi/fpm/tests/bug68458-pm-no-start-server.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug68458 - Missing pm.start_servers should emit notice instead of warning +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug72573-http-proxy.phpt b/sapi/fpm/tests/bug72573-http-proxy.phpt index ffa60d97134e..3298ad9c0bf1 100644 --- a/sapi/fpm/tests/bug72573-http-proxy.phpt +++ b/sapi/fpm/tests/bug72573-http-proxy.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug72573 - HTTP_PROXY - CVE-2016-5385 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt b/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt index 3cf44d11ffab..6d9bbf33575e 100644 --- a/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt +++ b/sapi/fpm/tests/bug73342-nonblocking-stdio.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug73342 - Non-blocking stdin +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug74083-concurrent-reload.phpt b/sapi/fpm/tests/bug74083-concurrent-reload.phpt index 8b4b690e9620..5ba429bb676d 100644 --- a/sapi/fpm/tests/bug74083-concurrent-reload.phpt +++ b/sapi/fpm/tests/bug74083-concurrent-reload.phpt @@ -1,5 +1,7 @@ --TEST-- Concurrent reload signals should not kill PHP-FPM master process. (Bug: #74083) +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug76601-reload-child-signals.phpt b/sapi/fpm/tests/bug76601-reload-child-signals.phpt index f095ed667ca8..60a37c01f496 100644 --- a/sapi/fpm/tests/bug76601-reload-child-signals.phpt +++ b/sapi/fpm/tests/bug76601-reload-child-signals.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug76601 children should not ignore signals during concurrent reloads +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug78323.phpt b/sapi/fpm/tests/bug78323.phpt index cf9102057314..1b7ea525d4be 100644 --- a/sapi/fpm/tests/bug78323.phpt +++ b/sapi/fpm/tests/bug78323.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Bug #78323 Test exit code for invalid parameters +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug78599-path-info-underflow.phpt b/sapi/fpm/tests/bug78599-path-info-underflow.phpt index edd4e0d49699..33fc43b36f4e 100644 --- a/sapi/fpm/tests/bug78599-path-info-underflow.phpt +++ b/sapi/fpm/tests/bug78599-path-info-underflow.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug78599 - env_path_info underflow - CVE-2019-11043 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt b/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt index 9c05471b6741..6e86d287e7ca 100644 --- a/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt +++ b/sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug80024 - Duplication of info about inherited socket after pool removing +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/bug80849-fpm.phpt b/sapi/fpm/tests/bug80849-fpm.phpt index abe179368b7e..fb1b2437dccc 100644 --- a/sapi/fpm/tests/bug80849-fpm.phpt +++ b/sapi/fpm/tests/bug80849-fpm.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #80849 (HTTP Status header truncation) +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/fastcgi_finish_request_basic.phpt b/sapi/fpm/tests/fastcgi_finish_request_basic.phpt index 939782fa312d..9ab625b8db54 100644 --- a/sapi/fpm/tests/fastcgi_finish_request_basic.phpt +++ b/sapi/fpm/tests/fastcgi_finish_request_basic.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Function fastcgi_finish_request basic test +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/fpm_get_status_basic.phpt b/sapi/fpm/tests/fpm_get_status_basic.phpt index d72a1f4d70ac..b099b03e4b3b 100644 --- a/sapi/fpm/tests/fpm_get_status_basic.phpt +++ b/sapi/fpm/tests/fpm_get_status_basic.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Function fpm_get_status basic test +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt index 90ecae3e449a..4e1e99702996 100644 --- a/sapi/fpm/tests/getallheaders.phpt +++ b/sapi/fpm/tests/getallheaders.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Function getallheaders basic test +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt b/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt index f968bf9f08bc..099f7f639915 100644 --- a/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt +++ b/sapi/fpm/tests/log-bm-in-shutdown-fn.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Log message in shutdown function +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 940d0df6e9ab..949d1e541972 100644 --- a/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt +++ b/sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered message output log with limit 1024 and msg 80 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 5354671ee2a7..cd2af94c6c1c 100644 --- a/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt +++ b/sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered message output log with limit 2048 and msg 4000 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 65524287459d..13611f639693 100644 --- a/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt +++ b/sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 1050 with 2048 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 c52880429273..dc7c90e563b4 100644 --- a/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt +++ b/sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 1050 with 2900 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt b/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt index 2259ecb1493c..278f2a0218ef 100644 --- a/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt +++ b/sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 64 fails because it is too low +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 fc8fbe1fe8ea..3e945b8eba77 100644 --- a/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt +++ b/sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with limit 8000 with 4096 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt index 0fdaf105493e..9b3110abac7c 100644 --- a/sapi/fpm/tests/log-bwd-msg-with-nl.phpt +++ b/sapi/fpm/tests/log-bwd-msg-with-nl.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with msg containing new lines +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 4a8fbf3a56e2..1fe10b2a7925 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed) +--CONFLICTS-- +fpm --SKIPIF-- --XFAIL-- diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt index d328aff9db24..319a90f8de5b 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output decorated log with multiple continuous messages +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 5a62285eda9d..2ee8d80b8e73 100644 --- a/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt +++ b/sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with limit 1024 and msg 120 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 10674935cce9..475b57ac63c6 100644 --- a/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt +++ b/sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with limit 1500 and msg 3300 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 01b00d44853b..4986b2273257 100644 --- a/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt +++ b/sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with msg with flush split in buffer +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 63b2555de76e..f805835d2aae 100644 --- a/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt +++ b/sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Buffered worker output plain log with msg with flush split in buffer +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/log-bwp-realloc-buffer.phpt b/sapi/fpm/tests/log-bwp-realloc-buffer.phpt index 3371bf8330c8..d24450673fee 100644 --- a/sapi/fpm/tests/log-bwp-realloc-buffer.phpt +++ b/sapi/fpm/tests/log-bwp-realloc-buffer.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: bug81513 - Buffered worker output plain log stream reallocation +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 5162206cdd03..92d42592fc7b 100644 --- a/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt +++ b/sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output decorated log with limit 1050 with 2048 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 fe08be6d3cba..770caf25cc0a 100644 --- a/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt +++ b/sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output decorated log with limit 1050 with 2900 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 351473fc2cfa..f1fb22541eeb 100644 --- a/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt +++ b/sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output decorated log with limit 8000 with 4096 msg +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- 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 61cb92331ebb..dd67caf0c58d 100644 --- a/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt +++ b/sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Direct worker output plain log with limit 1000 and msg 2000 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/main-global-prefix.phpt b/sapi/fpm/tests/main-global-prefix.phpt index 44486e4ed328..095e54ab69e2 100644 --- a/sapi/fpm/tests/main-global-prefix.phpt +++ b/sapi/fpm/tests/main-global-prefix.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Main invocation with prefix +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/main-version.phpt b/sapi/fpm/tests/main-version.phpt index 40ea45ef0102..e23acea80f59 100644 --- a/sapi/fpm/tests/main-version.phpt +++ b/sapi/fpm/tests/main-version.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: version string +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/php-admin-doc-root.phpt b/sapi/fpm/tests/php-admin-doc-root.phpt index a078c3aa2526..24f2d98c2152 100644 --- a/sapi/fpm/tests/php-admin-doc-root.phpt +++ b/sapi/fpm/tests/php-admin-doc-root.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: php_admin_value doc_root usage +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/pm-max-spawn-rate-config.phpt b/sapi/fpm/tests/pm-max-spawn-rate-config.phpt index 8b5f6b4eb640..08192dee460a 100644 --- a/sapi/fpm/tests/pm-max-spawn-rate-config.phpt +++ b/sapi/fpm/tests/pm-max-spawn-rate-config.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: set pm.max_spawn_rate +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/socket-ipv4-fallback.phpt b/sapi/fpm/tests/socket-ipv4-fallback.phpt index f0a8301916f7..68bf329bd751 100644 --- a/sapi/fpm/tests/socket-ipv4-fallback.phpt +++ b/sapi/fpm/tests/socket-ipv4-fallback.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Socket port connection falls back to IPv4 +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt index 885fd4d07507..b337db1a5e40 100644 --- a/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt +++ b/sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: UNIX socket owner and group settings can be numeric +--CONFLICTS-- +fpm --SKIPIF-- --FILE-- diff --git a/sapi/fpm/tests/status-listen.phpt b/sapi/fpm/tests/status-listen.phpt index c6476c033205..53e95d966e93 100644 --- a/sapi/fpm/tests/status-listen.phpt +++ b/sapi/fpm/tests/status-listen.phpt @@ -1,5 +1,7 @@ --TEST-- FPM: Status listen test +--CONFLICTS-- +fpm --SKIPIF-- --FILE--