clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweak cgi binary search

Browse Source
This commit is contained in:
Anatol Belski 2015-09-29 16:47:57 +02:00
parent df1a99d9a4
commit 353d996c9f
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sapi/cgi/tests/include.inc
View File

@ -21,18 +21,27 @@ function get_cgi_path() /* {{{ */
if ($cli) {
/* trying to guess ... */
$php_path = $php;
for ($i = 0; $i < 2; $i++) {
$slash_pos = strrpos($php_path, "/");
if ($slash_pos) {
$php_path = substr($php_path, 0, $slash_pos);
} else {
return FALSE;
}
}
if (defined("PHP_WINDOWS_VERSION_MAJOR")) {
/* On Windows it should be in the same dir as php.exe in most of the cases. */
$php_path = dirname($php);
if ($php_path && is_dir($php_path) && file_exists($php_path."/cgi/php-cgi") && is_executable($php_path."/cgi/php-cgi")) {
/* gotcha */
return $php_path."/cgi/php-cgi";
if (is_dir($php_path) && file_exists("$php_path/php-cgi.exe") && is_executable("$php_path/php-cgi.exe")) {
return "$php_path/php-cgi.exe";
}
} else {
for ($i = 0; $i < 2; $i++) {
$slash_pos = strrpos($php_path, "/");
if ($slash_pos) {
$php_path = substr($php_path, 0, $slash_pos);
} else {
return FALSE;
}
}
if ($php_path && is_dir($php_path) && file_exists($php_path."/cgi/php-cgi") && is_executable($php_path."/cgi/php-cgi")) {
/* gotcha */
return $php_path."/cgi/php-cgi";
}
}
return false;
}

4
sapi/cgi/tests/skipif.inc
View File

@ -4,10 +4,6 @@ if (substr(php_sapi_name(), 0, 3) == "cgi") {
exit;
}
if (substr(PHP_OS, 0, 3) == 'WIN') {
die ("skip not for Windows");
}
include dirname(__FILE__)."/include.inc";
if (!get_cgi_path()) {