archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
Download patch file Download diff file Expand all files Collapse all files

9
sapi/cgi/tests/include.inc
View file

@ -21,6 +21,14 @@ function get_cgi_path() /* {{{ */
if ($cli) { if ($cli) {
/* trying to guess ... */ /* trying to guess ... */
$php_path = $php; $php_path = $php;
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 (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++) { for ($i = 0; $i < 2; $i++) {
$slash_pos = strrpos($php_path, "/"); $slash_pos = strrpos($php_path, "/");
if ($slash_pos) { if ($slash_pos) {
@ -34,6 +42,7 @@ function get_cgi_path() /* {{{ */
/* gotcha */ /* gotcha */
return $php_path."/cgi/php-cgi"; return $php_path."/cgi/php-cgi";
} }
}
return false; return false;
} }
/* uhm? what's that then? */ /* uhm? what's that then? */

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

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