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:
Anatol Belski 2014-07-10 22:15:52 +02:00
commit fbc21af87b

View file

@ -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;