archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source
This commit is contained in:
Jakub Zelenka 2024-06-16 12:24:25 +01:00
commit c33f58867e
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
2 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/fpm/fpm/fpm_conf.c
View file

@ -763,6 +763,8 @@ static int fpm_worker_pool_shared_status_alloc(struct fpm_worker_pool_s *shared_
FPM_WPC_STR_CP(config, shared_config, user); FPM_WPC_STR_CP(config, shared_config, user);
FPM_WPC_STR_CP(config, shared_config, group); FPM_WPC_STR_CP(config, shared_config, group);
FPM_WPC_STR_CP(config, shared_config, pm_status_path); FPM_WPC_STR_CP(config, shared_config, pm_status_path);
FPM_WPC_STR_CP(config, shared_config, ping_path);
FPM_WPC_STR_CP(config, shared_config, ping_response);
fpm_conf_apply_kv_array_to_kv_array(shared_config->php_values, (char *)config + WPO(php_values)); fpm_conf_apply_kv_array_to_kv_array(shared_config->php_values, (char *)config + WPO(php_values));
fpm_conf_apply_kv_array_to_kv_array(shared_config->php_admin_values, (char *)config + WPO(php_admin_values)); fpm_conf_apply_kv_array_to_kv_array(shared_config->php_admin_values, (char *)config + WPO(php_admin_values));

40
sapi/fpm/tests/status-ping.phpt Normal file
View file

@ -0,0 +1,40 @@
--TEST--
FPM: Ping on the status invisible pool
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php
require_once "tester.inc";
$cfg = <<<EOT
[global]
error_log = {{FILE:LOG}}
[unconfined]
listen = {{ADDR}}
pm = static
pm.max_children = 1
pm.status_listen = {{ADDR[status]}}
pm.status_path = /status
ping.path = /ping
ping.response = pong
EOT;
$tester = new FPM\Tester($cfg);
$tester->start();
$tester->expectLogStartNotices();
$tester->ping('{{ADDR[status]}}');
usleep(100000);
$tester->terminate();
$tester->expectLogTerminatingNotices();
$tester->close();
?>
Done
--EXPECT--
Done
--CLEAN--
<?php
require_once "tester.inc";
FPM\Tester::clean();
?>