Merge branch 'PHP-8.3'

bukka · bukka · commit 2d8f7df3b430 · 2023-12-01T14:49:22.000Z
diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
@@ -56,7 +56,7 @@ int fpm_status_export_to_zval(zval *status)
 
 	scoreboard_p = fpm_scoreboard_acquire(NULL, 1);
 	if (!scoreboard_p) {
-		zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);
+		zlog(ZLOG_NOTICE, "[pool (unknown)] status: scoreboard already in use.");
 		return -1;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ int fpm_status_export_to_zval(zval *status)`
`56`	`56`
`57`	`57`	`scoreboard_p = fpm_scoreboard_acquire(NULL, 1);`
`58`	`58`	`if (!scoreboard_p) {`
`59`		`- zlog(ZLOG_NOTICE, "[pool %s] status: scoreboard already in use.", scoreboard_p->pool);`
	`59`	`+ zlog(ZLOG_NOTICE, "[pool (unknown)] status: scoreboard already in use.");`
`60`	`60`	`return -1;`
`61`	`61`	`}`
`62`	`62`