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

Merge branch 'PHP-7.1' into PHP-7.2

Browse source
This commit is contained in:
Nikita Popov 2018-01-12 18:18:34 +01:00
commit f8c889760c
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sapi/cli/php_cli_server.c
View file

@ -2095,6 +2095,12 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
{ {
int decline = 0; int decline = 0;
zend_file_handle zfd; zend_file_handle zfd;
char *old_cwd;
ALLOCA_FLAG(use_heap)
old_cwd = do_alloca(MAXPATHLEN, use_heap);
old_cwd[0] = '\0';
php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1));
zfd.type = ZEND_HANDLE_FILENAME; zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = server->router; zfd.filename = server->router;
@ -2116,6 +2122,12 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
} }
} zend_end_try(); } zend_end_try();
if (old_cwd[0] != '\0') {
php_ignore_value(VCWD_CHDIR(old_cwd));
}
free_alloca(old_cwd, use_heap);
return decline; return decline;
} }
/* }}} */ /* }}} */
@ -2307,21 +2319,11 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c
if (router) { if (router) {
size_t router_len = strlen(router); size_t router_len = strlen(router);
if (!IS_ABSOLUTE_PATH(router, router_len)) {
_router = pemalloc(server->document_root_len + router_len + 2, 1);
if (!_router) {
retval = FAILURE;
goto out;
}
snprintf(_router,
server->document_root_len + router_len + 2, "%s%c%s", server->document_root, DEFAULT_SLASH, router);
} else {
_router = pestrndup(router, router_len, 1); _router = pestrndup(router, router_len, 1);
if (!_router) { if (!_router) {
retval = FAILURE; retval = FAILURE;
goto out; goto out;
} }
}
server->router = _router; server->router = _router;
server->router_len = router_len; server->router_len = router_len;
} else { } else {