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.0' into PHP-7.1

Browse source 
* PHP-7.0:
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
This commit is contained in:
Xinchen Hui 2017-10-15 10:28:46 +08:00
commit 49702ad7fb
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sapi/cli/php_cli_server.c
View file

@ -2124,12 +2124,6 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
{
int decline = 0;
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.filename = server->router;
@ -2151,12 +2145,6 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
}
} zend_end_try();
if (old_cwd[0] != '\0') {
php_ignore_value(VCWD_CHDIR(old_cwd));
}
free_alloca(old_cwd, use_heap);
return decline;
}
/* }}} */
@ -2348,10 +2336,20 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c
if (router) {
size_t router_len = strlen(router);
_router = pestrndup(router, router_len, 1);
if (!_router) {
retval = FAILURE;
goto out;
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);
if (!_router) {
retval = FAILURE;
goto out;
}
}
server->router = _router;
server->router_len = router_len;