mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 10:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1'

Browse Source
This commit is contained in:
Jakub Zelenka 2017-01-29 20:46:20 +00:00
commit 10cd88588e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sapi/fpm/tests/include.inc
View File

@ -3,7 +3,6 @@
function get_fpm_path() /* {{{ */
{
$php_path = getenv("TEST_PHP_EXECUTABLE");
for ($i = 0; $i < 2; $i++) {
$slash_pos = strrpos($php_path, "/");
if ($slash_pos) {
@ -13,9 +12,16 @@ function get_fpm_path() /* {{{ */
}
}
if ($php_path && is_dir($php_path) && file_exists($php_path."/fpm/php-fpm") && is_executable($php_path."/fpm/php-fpm")) {
/* gotcha */
return $php_path."/fpm/php-fpm";
if ($php_path && is_dir($php_path)) {
if (file_exists($php_path."/fpm/php-fpm") && is_executable($php_path."/fpm/php-fpm")) {
/* gotcha */
return $php_path."/fpm/php-fpm";
}
$php_sbin_fpm = $php_path."/sbin/php-fpm";
if (file_exists($php_sbin_fpm) && is_executable($php_sbin_fpm)) {
return $php_sbin_fpm;
}
}
return false;
}