From: Anatol Belski <ab@php.net>
Date: Fri, 21 Oct 2016 18:15:16 +0000 (+0200)
Subject: Revert "Fixed bug #73360 Unable to work in root with unicode chars"
X-Git-Tag: php-7.1.0RC5~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbf46d36ca3d1fb0a285437ae1dcf99c6bee86d5;p=php

Revert "Fixed bug #73360 Unable to work in root with unicode chars"

This reverts commit 64fee0aecb2c804a088b896da6f736dbc19d8424.
---

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index bb445d986f..7ae6c6f1a4 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 (!VCWD_STAT(buf, &sb)) {
+		if (!zend_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 (!VCWD_STAT(buf, &sb) && (sb.st_mode & S_IFREG)) {
+					if (!zend_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 (VCWD_STAT(document_root, &sb)) {
+		if (zend_stat(document_root, &sb)) {
 			fprintf(stderr, "Directory %s does not exist.\n", document_root);
 			return 1;
 		}