From c10d14887099b3294816f9757e7f6ea55e4b0bfa Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Wed, 6 Jul 2011 01:54:54 +0000 Subject: [PATCH] - Fixed bug #55076 (requires() fails in a subdirectory with the in-built webserver) --- sapi/cli/php_cli_server.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 365f352244..66d3bc5ae4 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2060,6 +2060,8 @@ int do_cli_server(int argc, char **argv TSRMLS_DC) /* {{{ */ if (document_root) { struct stat sb; + char resolved_path[MAXPATHLEN]; + if (stat(document_root, &sb)) { fprintf(stderr, "Directory %s does not exist.\n", document_root); return 1; @@ -2068,6 +2070,9 @@ int do_cli_server(int argc, char **argv TSRMLS_DC) /* {{{ */ fprintf(stderr, "%s is not a directory.\n", document_root); return 1; } + if (VCWD_REALPATH(document_root, resolved_path)) { + document_root = resolved_path; + } } else { char path[MAXPATHLEN]; char *ret = NULL; -- 2.40.0