Skip to content

Commit c33f588

Browse files
committed
Merge branch 'PHP-8.3'
2 parents a6b5439 + ea79560 commit c33f588

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

sapi/fpm/fpm/fpm_conf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static int fpm_worker_pool_shared_status_alloc(struct fpm_worker_pool_s *shared_
763763
FPM_WPC_STR_CP(config, shared_config, user);
764764
FPM_WPC_STR_CP(config, shared_config, group);
765765
FPM_WPC_STR_CP(config, shared_config, pm_status_path);
766+
FPM_WPC_STR_CP(config, shared_config, ping_path);
767+
FPM_WPC_STR_CP(config, shared_config, ping_response);
766768

767769
fpm_conf_apply_kv_array_to_kv_array(shared_config->php_values, (char *)config + WPO(php_values));
768770
fpm_conf_apply_kv_array_to_kv_array(shared_config->php_admin_values, (char *)config + WPO(php_admin_values));

sapi/fpm/tests/status-ping.phpt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
--TEST--
2+
FPM: Ping on the status invisible pool
3+
--SKIPIF--
4+
<?php include "skipif.inc"; ?>
5+
--FILE--
6+
<?php
7+
8+
require_once "tester.inc";
9+
10+
$cfg = <<<EOT
11+
[global]
12+
error_log = {{FILE:LOG}}
13+
[unconfined]
14+
listen = {{ADDR}}
15+
pm = static
16+
pm.max_children = 1
17+
pm.status_listen = {{ADDR[status]}}
18+
pm.status_path = /status
19+
ping.path = /ping
20+
ping.response = pong
21+
EOT;
22+
23+
$tester = new FPM\Tester($cfg);
24+
$tester->start();
25+
$tester->expectLogStartNotices();
26+
$tester->ping('{{ADDR[status]}}');
27+
usleep(100000);
28+
$tester->terminate();
29+
$tester->expectLogTerminatingNotices();
30+
$tester->close();
31+
32+
?>
33+
Done
34+
--EXPECT--
35+
Done
36+
--CLEAN--
37+
<?php
38+
require_once "tester.inc";
39+
FPM\Tester::clean();
40+
?>

0 commit comments

Comments
 (0)