diff options
| -rw-r--r-- | ext/standard/tests/file/bug72035.phpt | 40 | ||||
| -rw-r--r-- | main/fopen_wrappers.c | 7 |
2 files changed, 47 insertions, 0 deletions
diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt new file mode 100644 index 0000000000..a2abbb7f35 --- /dev/null +++ b/ext/standard/tests/file/bug72035.phpt @@ -0,0 +1,40 @@ +--TEST-- +Bug #72035 php-cgi.exe fails to run scripts relative to drive root +--SKIPIF-- +<?php +if(substr(PHP_OS, 0, 3) != 'WIN' ) die('skip windows only test'); +if(php_sapi_name() != "cli") die('skip CLI only test'); + +$cgi = realpath(dirname(PHP_BINARY)) . DIRECTORY_SEPARATOR . "php-cgi.exe"; +if (!file_exists($cgi)) die('skip CGI binary not found'); +?> +--FILE-- +<?php + +$fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . md5(uniqid()) . ".php"; +$fl = substr($fl, 2); + +$cgi = realpath(dirname(PHP_BINARY) . DIRECTORY_SEPARATOR . "php-cgi.exe"); + +file_put_contents($fl, "<?php echo \"hello\", \"\n\"; ?>"); + +$cmd = "$cgi -n -C $fl"; + +/* Need to run CGI with the env reset. */ +$desc = array(0 => array("pipe", "r")); +$proc = proc_open($cmd, $desc, $pipes, getcwd(), array()); +if (is_resource($proc)) { + echo stream_get_contents($pipes[0]); + + proc_close($proc); +} + +unlink($fl); +?> +==DONE== +--EXPECTF-- +X-Powered-By: PHP/%s +Content-type: text/html; charset=UTF-8 + +hello +==DONE== diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index e4d5688de3..ab51e5e58b 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -505,6 +505,13 @@ PHPAPI zend_string *php_resolve_path(const char *filename, int filename_length, (IS_SLASH(filename[1]) || ((filename[1] == '.') && IS_SLASH(filename[2])))) || IS_ABSOLUTE_PATH(filename, filename_length) || +#if PHP_WIN32 + /* This should count as an absolute local path as well, however + IS_ABSOLUTE_PATH doesn't care about this path form till now. It + might be a big thing to extend, thus just a local handling for + now. */ + filename_length >=2 && IS_SLASH(filename[0]) && !IS_SLASH(filename[1]) || +#endif !path || !*path) { if (tsrm_realpath(filename, resolved_path)) { |