archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Browse source 
Conflicts:
	sapi/litespeed/lsapilib.h
This commit is contained in:
Anatol Belski 2014-07-10 22:15:52 +02:00
commit fbc21af87b
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sapi/litespeed/lsapilib.c
View file

@ -2686,6 +2686,7 @@ static lsapi_child_status * find_child_status( int pid )
if ( pStatus + 1 > g_prefork_server->m_pChildrenStatusCur ) if ( pStatus + 1 > g_prefork_server->m_pChildrenStatusCur )
g_prefork_server->m_pChildrenStatusCur = pStatus + 1; g_prefork_server->m_pChildrenStatusCur = pStatus + 1;
return pStatus; return pStatus;
}
++pStatus; ++pStatus;
} }
return NULL; return NULL;