mirror of
https://github.com/php/php-src.git
synced 2025-08-20 01:14:28 +02:00
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts: sapi/litespeed/lsapilib.h
This commit is contained in:
commit
fbc21af87b
1 changed files with 1 additions and 0 deletions
|
@ -2686,6 +2686,7 @@ static lsapi_child_status * find_child_status( int pid )
|
|||
if ( pStatus + 1 > g_prefork_server->m_pChildrenStatusCur )
|
||||
g_prefork_server->m_pChildrenStatusCur = pStatus + 1;
|
||||
return pStatus;
|
||||
}
|
||||
++pStatus;
|
||||
}
|
||||
return NULL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue