diff --git a/NEWS b/NEWS index fc339dbffb5..4346185613f 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,10 @@ PHP NEWS - DOM: . Fixed bug GH-14343 (Memory leak in xml and dom). (nielsdos) +- FPM: + . Fixed bug GH-14037 (PHP-FPM ping.path and ping.response config vars are + ignored in status pool). (Wilhansen Li, Pierrick Charron) + - GD: . Fix parameter numbers for imagecolorset(). (Giovanni Giacobbi) diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index d128681eaf5..7eb7f9c7d09 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -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, group); 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_admin_values, (char *)config + WPO(php_admin_values)); diff --git a/sapi/fpm/tests/status-ping.phpt b/sapi/fpm/tests/status-ping.phpt new file mode 100644 index 00000000000..9516efad751 --- /dev/null +++ b/sapi/fpm/tests/status-ping.phpt @@ -0,0 +1,40 @@ +--TEST-- +FPM: Ping on the status invisible pool +--SKIPIF-- + +--FILE-- +start(); +$tester->expectLogStartNotices(); +$tester->ping('{{ADDR[status]}}'); +usleep(100000); +$tester->terminate(); +$tester->expectLogTerminatingNotices(); +$tester->close(); + +?> +Done +--EXPECT-- +Done +--CLEAN-- +