Commit ea79560

committed

Merge branch 'PHP-8.2' into PHP-8.3

2 parents 784b745 + 43bc53a commit ea79560Copy full SHA for ea79560

File tree

+46

-0

lines changed

+46

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ PHP NEWS`
`24`	`24`	`- DOM:`
`25`	`25`	`. Fixed bug GH-14343 (Memory leak in xml and dom). (nielsdos)`
`26`	`26`
	`27`	`+- FPM:`
	`28`	`+ . Fixed bug GH-14037 (PHP-FPM ping.path and ping.response config vars are`
	`29`	`+ ignored in status pool). (Wilhansen Li, Pierrick Charron)`
	`30`	`+`
`27`	`31`	`- GD:`
`28`	`32`	`. Fix parameter numbers for imagecolorset(). (Giovanni Giacobbi)`
`29`	`33`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -763,6 +763,8 @@ static int fpm_worker_pool_shared_status_alloc(struct fpm_worker_pool_s *shared_`
`763`	`763`	`FPM_WPC_STR_CP(config, shared_config, user);`
`764`	`764`	`FPM_WPC_STR_CP(config, shared_config, group);`
`765`	`765`	`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);`
`766`	`768`
`767`	`769`	`fpm_conf_apply_kv_array_to_kv_array(shared_config->php_values, (char *)config + WPO(php_values));`
`768`	`770`	`fpm_conf_apply_kv_array_to_kv_array(shared_config->php_admin_values, (char *)config + WPO(php_admin_values));`

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff 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`	`+?>`

Comments

(0)