php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.php.net:/php-src

Browse Source
This commit is contained in:
Kalle Sommer Nielsen
2018-10-03 13:36:30 +02:00
parent 5268f367ce 4778578b56
commit d604f65de5
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/zip/php_zip.h
View File

@@ -37,7 +37,7 @@ extern zend_module_entry zip_module_entry;
#define ZIP_OVERWRITE ZIP_TRUNCATE
#endif
#define PHP_ZIP_VERSION "1.15.3"
#define PHP_ZIP_VERSION "1.15.4"
#define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)

21
sapi/cgi/cgi_main.c
View File

@@ -228,9 +228,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
@@ -1493,6 +1494,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;
@@ -2129,8 +2134,9 @@ consult the installation file that came with this distribution, or visit \n\
int i;
ZeroMemory(&kid_cgi_ps, sizeof(kid_cgi_ps));
kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN;
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 */
@@ -2183,6 +2189,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;
@@ -2240,6 +2253,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;