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

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fixed bug #73830 Directory does not exist.
This commit is contained in:
Anatol Belski 2017-11-28 12:42:40 +01:00
commit 79940993de
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sapi/cli/php_cli_server.c
View file

@ -2519,6 +2519,10 @@ int do_cli_server(int argc, char **argv) /* {{{ */
const char *server_bind_address = NULL; const char *server_bind_address = NULL;
extern const opt_struct OPTIONS[]; extern const opt_struct OPTIONS[];
const char *document_root = NULL; const char *document_root = NULL;
#ifdef PHP_WIN32
char document_root_tmp[MAXPATHLEN];
size_t k;
#endif
const char *router = NULL; const char *router = NULL;
char document_root_buf[MAXPATHLEN]; char document_root_buf[MAXPATHLEN];
@ -2528,7 +2532,23 @@ int do_cli_server(int argc, char **argv) /* {{{ */
server_bind_address = php_optarg; server_bind_address = php_optarg;
break; break;
case 't': case 't':
#ifndef PHP_WIN32
document_root = php_optarg; document_root = php_optarg;
#else
k = strlen(php_optarg);
if (k + 1 > MAXPATHLEN) {
fprintf(stderr, "Document root path is too long.\n");
return 1;
}
memmove(document_root_tmp, php_optarg, k + 1);
/* Clean out any trailing garbage that might have been passed
from a batch script. */
do {
document_root_tmp[k] = '\0';
k--;
} while ('"' == document_root_tmp[k] || ' ' == document_root_tmp[k]);
document_root = document_root_tmp;
#endif
break; break;
} }
} }