Skip to content

Commit

Permalink
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
weltling committed Oct 3, 2018
1 parent 945f315 commit b0547a3
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion sapi/cgi/cgi_main.c
Expand Up @@ -226,9 +226,10 @@ static php_cgi_globals_struct php_cgi_globals;
#ifdef PHP_WIN32
#define WIN32_MAX_SPAWN_CHILDREN 64
HANDLE kid_cgi_ps[WIN32_MAX_SPAWN_CHILDREN];
int kids;
int kids, cleaning_up = 0;
HANDLE job = NULL;
JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_info = { 0 };
CRITICAL_SECTION cleanup_lock;
#endif

#ifndef HAVE_ATTRIBUTE_WEAK
Expand Down Expand Up @@ -1492,6 +1493,10 @@ BOOL WINAPI fastcgi_cleanup(DWORD sig)
{
int i = kids;

EnterCriticalSection(&cleanup_lock);
cleaning_up = 1;
LeaveCriticalSection(&cleanup_lock);

while (0 < i--) {
if (NULL == kid_cgi_ps[i]) {
continue;
Expand Down Expand Up @@ -2186,6 +2191,7 @@ consult the installation file that came with this distribution, or visit \n\
ZeroMemory(&kid_cgi_ps, sizeof(kid_cgi_ps));
kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN;

InitializeCriticalSection(&cleanup_lock);
SetConsoleCtrlHandler(fastcgi_cleanup, TRUE);

/* kids will inherit the env, don't let them spawn */
Expand Down Expand Up @@ -2234,6 +2240,13 @@ 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;
}
LeaveCriticalSection(&cleanup_lock);

i = kids;
while (0 < i--) {
DWORD status;
Expand Down Expand Up @@ -2289,6 +2302,8 @@ consult the installation file that came with this distribution, or visit \n\
/* restore my env */
SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf);

DeleteCriticalSection(&cleanup_lock);

goto parent_out;
} else {
parent = 0;
Expand Down

0 comments on commit b0547a3

Please sign in to comment.