diff options
| author | Anatol Belski <ab@php.net> | 2018-10-03 14:34:08 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-10-03 14:34:08 +0200 |
| commit | b8cfa09657aed6f616068d44aca5dc0b3295b8f6 (patch) | |
| tree | 8cf7ba792ee8cb19abf0f70c52e6b5b49159d931 | |
| parent | da05b7e81e419e8199058cde6f5b1f37a1a98e4e (diff) | |
| parent | 044eb39e633c91d55b339415ee5749a46496ffd9 (diff) | |
| download | php-git-b8cfa09657aed6f616068d44aca5dc0b3295b8f6.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Avoid code duplication and don't miss env restore
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 48d622318c..fa9fbd3c3f 100644 --- 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); |