diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-18 16:00:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-18 16:00:30 +0200 |
| commit | 111f05610dc75675a5d9146d3686b439c17895de (patch) | |
| tree | 40ce72bdad4196a2efdc5043b67600ca96dc9963 | |
| parent | b5f5da421109e1578dabcc88272d985a706c4b51 (diff) | |
| parent | 76ca6bf3eff437f0493bbdd87bdfb6569ca56501 (diff) | |
| download | php-git-111f05610dc75675a5d9146d3686b439c17895de.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 2 | ||||
| -rw-r--r-- | sapi/fpm/tests/log-bwd-multiple-msgs.phpt | 2 |
2 files changed, 0 insertions, 4 deletions
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 22f2dd1600..376a972bac 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt @@ -2,8 +2,6 @@ FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed) --SKIPIF-- <?php include "skipif.inc"; ?> ---XFAIL-- -Fails regularly due to log line termination bug --FILE-- <?php diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt index 2541febed7..b221a8344c 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt @@ -47,5 +47,3 @@ Done require_once "tester.inc"; FPM\Tester::clean(); ?> ---XFAIL-- -There are bugs in FPM |