Merge branch 'PHP-8.2'

bukka · bukka · commit da4775f071d4 · 2023-01-12T13:55:47.000Z
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -1801,7 +1801,8 @@ consult the installation file that came with this distribution, or visit \n\
 			zend_quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
 			close(fpm_globals.send_config_pipe[1]);
 		}
-		return FPM_EXIT_CONFIG;
+		exit_status = FPM_EXIT_CONFIG;
+		goto out;
 	}
 
 	if (fpm_globals.send_config_pipe[1]) {
diff --git a/sapi/fpm/tests/bug68591-conf-test-group.phpt b/sapi/fpm/tests/bug68591-conf-test-group.phpt
@@ -14,6 +14,7 @@ $cfg = <<<EOT
 error_log = {{FILE:LOG}}
 [unconfined]
 listen = {{ADDR:UDS}}
+user = root
 group = aaaaaa
 pm = dynamic
 pm.max_children = 5
diff --git a/sapi/fpm/tests/bug68591-conf-test-listen-group.phpt b/sapi/fpm/tests/bug68591-conf-test-listen-group.phpt
@@ -15,6 +15,7 @@ error_log = {{FILE:LOG}}
 [unconfined]
 listen = {{ADDR:UDS}}
 listen.group = aaaaaa
+user = root
 pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2
diff --git a/sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt b/sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt
@@ -15,6 +15,7 @@ error_log = {{FILE:LOG}}
 [unconfined]
 listen = {{ADDR:UDS}}
 listen.owner = aaaaaa
+user = root
 pm = dynamic
 pm.max_children = 5
 pm.start_servers = 2

Original file line number	Diff line number	Diff line change
`@@ -1801,7 +1801,8 @@ consult the installation file that came with this distribution, or visit \n\`
`1801`	`1801`	`zend_quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));`
`1802`	`1802`	`close(fpm_globals.send_config_pipe[1]);`
`1803`	`1803`	`}`
`1804`		`- return FPM_EXIT_CONFIG;`
	`1804`	`+ exit_status = FPM_EXIT_CONFIG;`
	`1805`	`+ goto out;`
`1805`	`1806`	`}`
`1806`	`1807`
`1807`	`1808`	`if (fpm_globals.send_config_pipe[1]) {`