summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2019-05-13 18:51:05 +0100
committerJakub Zelenka <bukka@php.net>2019-05-13 18:51:05 +0100
commitaa74c3046674d7373048f609fdc12dae71351b1b (patch)
treefbdc59f15a89a5b76435b413e8d461227f5f5982
parent69bab6e5a5c8afba684b5fbde6e005a47408d01e (diff)
parentad63bd169bd82347acd24e69fec500589f185272 (diff)
downloadphp-git-aa74c3046674d7373048f609fdc12dae71351b1b.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
-rw-r--r--sapi/fpm/tests/bug77934-reload-process-control.phpt4
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/fpm/tests/bug77934-reload-process-control.phpt b/sapi/fpm/tests/bug77934-reload-process-control.phpt
index d223403f99..e7da04421b 100644
--- a/sapi/fpm/tests/bug77934-reload-process-control.phpt
+++ b/sapi/fpm/tests/bug77934-reload-process-control.phpt
@@ -14,6 +14,8 @@ pid = {{FILE:PID}}
process_control_timeout=20
[unconfined]
listen = {{ADDR}}
+ping.path = /ping
+ping.response = pong
pm = dynamic
pm.max_children = 5
pm.start_servers = 1
@@ -24,11 +26,13 @@ EOT;
$tester = new FPM\Tester($cfg);
$tester->start();
$tester->expectLogStartNotices();
+$tester->ping('{{ADDR}}');
$tester->signal('USR2');
$tester->expectLogNotice('Reloading in progress ...');
$tester->expectLogNotice('reloading: .*');
$tester->expectLogNotice('using inherited socket fd=\d+, "127.0.0.1:\d+"');
$tester->expectLogStartNotices();
+$tester->ping('{{ADDR}}');
$tester->terminate();
$tester->expectLogTerminatingNotices();
$tester->close();