archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3'

Browse source 
* PHP-7.3:
  Avoid code duplication and don't miss env restore
This commit is contained in:
Anatol Belski 2018-10-03 14:36:09 +02:00
commit 1c11fc7f13
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sapi/cgi/cgi_main.c
View file

@ -2191,8 +2191,7 @@ consult the installation file that came with this distribution, or visit \n\
while (parent) { while (parent) {
EnterCriticalSection(&cleanup_lock); EnterCriticalSection(&cleanup_lock);
if (cleaning_up) { if (cleaning_up) {
DeleteCriticalSection(&cleanup_lock); goto parent_loop_end;
goto parent_out;
} }
LeaveCriticalSection(&cleanup_lock); LeaveCriticalSection(&cleanup_lock);
@ -2249,7 +2248,8 @@ consult the installation file that came with this distribution, or visit \n\
WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE); WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE);
} }
parent_loop_end:
/* restore my env */ /* restore my env */
SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf); SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf);