Merge branch 'PHP-7.1' into PHP-7.2

weltling · weltling · commit b8cfa09657ae · 2018-10-03T14:34:08.000+02:00
* PHP-7.1:
  Avoid code duplication and don't miss env restore
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
@@ -2236,8 +2236,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);
 
@@ -2293,6 +2292,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
`@@ -2236,8 +2236,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2236`	`2236`	`while (parent) {`
`2237`	`2237`	`EnterCriticalSection(&cleanup_lock);`
`2238`	`2238`	`if (cleaning_up) {`
`2239`		`- DeleteCriticalSection(&cleanup_lock);`
`2240`		`- goto parent_out;`
	`2239`	`+ goto parent_loop_end;`
`2241`	`2240`	`}`
`2242`	`2241`	`LeaveCriticalSection(&cleanup_lock);`
`2243`	`2242`
`@@ -2293,6 +2292,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2293`	`2292`	`WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE);`
`2294`	`2293`	`}`
`2295`	`2294`
	`2295`	`+parent_loop_end:`
`2296`	`2296`	`/* restore my env */`
`2297`	`2297`	`SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf);`
`2298`	`2298`