summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-21 16:00:49 +0200
committerAnatol Belski <ab@php.net>2016-10-21 16:00:49 +0200
commit04bba0c078ccbe65672c8ec1476eb9af4b6b432c (patch)
tree026f3642da9c0471faab8d6a6c3945b47f9ee915 /sapi
parent61e15a37a1eb21e692e5375eb1a86305d04d1a26 (diff)
parent64fee0aecb2c804a088b896da6f736dbc19d8424 (diff)
downloadphp-git-04bba0c078ccbe65672c8ec1476eb9af4b6b432c.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: Fixed bug #73360 Unable to work in root with unicode chars
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/php_cli_server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 7ae6c6f1a4..bb445d986f 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1400,7 +1400,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
*p = '\0';
q = p;
while (q > buf) {
- if (!zend_stat(buf, &sb)) {
+ if (!VCWD_STAT(buf, &sb)) {
if (sb.st_mode & S_IFDIR) {
const char **file = index_files;
if (q[-1] != DEFAULT_SLASH) {
@@ -1409,7 +1409,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
while (*file) {
size_t l = strlen(*file);
memmove(q, *file, l + 1);
- if (!zend_stat(buf, &sb) && (sb.st_mode & S_IFREG)) {
+ if (!VCWD_STAT(buf, &sb) && (sb.st_mode & S_IFREG)) {
q += l;
break;
}
@@ -2502,7 +2502,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */
if (document_root) {
zend_stat_t sb;
- if (zend_stat(document_root, &sb)) {
+ if (VCWD_STAT(document_root, &sb)) {
fprintf(stderr, "Directory %s does not exist.\n", document_root);
return 1;
}