Avoid code duplication and don't miss env restore

weltling · weltling · commit 044eb39e633c · 2018-10-03T14:32:52.000+02:00
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
@@ -2242,8 +2242,7 @@ consult the installation file that came with this distribution, or visit \n\
 			while (parent) {
 				EnterCriticalSection(&cleanup_lock);
 				if (cleaning_up) {
-					DeleteCriticalSection(&cleanup_lock);
-					goto parent_out;
+					goto parent_loop_end;
 				}
 				LeaveCriticalSection(&cleanup_lock);
 
@@ -2299,6 +2298,7 @@ consult the installation file that came with this distribution, or visit \n\
 				WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE);
 			}
 			
+parent_loop_end:
 			/* restore my env */
 			SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf);
 

Original file line number	Diff line number	Diff line change
`@@ -2242,8 +2242,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2242`	`2242`	`while (parent) {`
`2243`	`2243`	`EnterCriticalSection(&cleanup_lock);`
`2244`	`2244`	`if (cleaning_up) {`
`2245`		`- DeleteCriticalSection(&cleanup_lock);`
`2246`		`- goto parent_out;`
	`2245`	`+ goto parent_loop_end;`
`2247`	`2246`	`}`
`2248`	`2247`	`LeaveCriticalSection(&cleanup_lock);`
`2249`	`2248`
`@@ -2299,6 +2298,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2299`	`2298`	`WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE);`
`2300`	`2299`	`}`
`2301`	`2300`
	`2301`	`+parent_loop_end:`
`2302`	`2302`	`/* restore my env */`
`2303`	`2303`	`SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf);`
`2304`	`2304`