diff options
| author | Anatol Belski <ab@php.net> | 2014-07-10 22:15:52 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-10 22:15:52 +0200 |
| commit | fbc21af87b752b99f6b78503cadc89dbba6c98f1 (patch) | |
| tree | 11337ae874dec6802d8e3d65d0b8e49b747c5b43 | |
| parent | 552cfcc578b5372ecae08aaf600df8b469f20100 (diff) | |
| parent | 7f41a34c231c248077f2b6d949ade2dbf270652a (diff) | |
| download | php-git-fbc21af87b752b99f6b78503cadc89dbba6c98f1.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
sapi/litespeed/lsapilib.h
| -rw-r--r-- | sapi/litespeed/lsapilib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index e405d632ed..9c1b73660e 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -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; |