diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-01-29 20:44:51 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-01-29 20:44:51 +0000 |
| commit | 1dab39b9aa0934e01d8ad1e91d0db3bbd20a1dbd (patch) | |
| tree | 60e4049a918647eabd78e68eb7ccf71562d9f2c8 | |
| parent | 366f83848323cac22dedf76597060138b80b95fd (diff) | |
| parent | df16579642217708778e6917ce7c01cb9748df2e (diff) | |
| download | php-git-1dab39b9aa0934e01d8ad1e91d0db3bbd20a1dbd.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | sapi/fpm/tests/include.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sapi/fpm/tests/include.inc b/sapi/fpm/tests/include.inc index 6599255a7a..8faf53dcc2 100644 --- a/sapi/fpm/tests/include.inc +++ b/sapi/fpm/tests/include.inc @@ -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; } |