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

Introduce zend_stream_init_filename()

Browse source 
Avoid more ad-hoc initialization of zend_file_handle structures.
This commit is contained in:
Nikita Popov 2019-07-16 16:40:54 +02:00
parent 46faf8f018
commit 49bac9b77b
13 changed files with 29 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sapi/cli/php_cli_server.c
View file

@ -2072,11 +2072,7 @@ static int php_cli_server_dispatch_script(php_cli_server *server, php_cli_server
}
{
zend_file_handle zfd;
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = SG(request_info).path_translated;
zfd.handle.fp = NULL;
zfd.free_filename = 0;
zfd.opened_path = NULL;
zend_stream_init_filename(&zfd, SG(request_info).path_translated);
zend_try {
php_execute_script(&zfd);
} zend_end_try();
@ -2197,11 +2193,7 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
old_cwd[0] = '\0';
php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1));
zfd.type = ZEND_HANDLE_FILENAME;
zfd.filename = server->router;
zfd.handle.fp = NULL;
zfd.free_filename = 0;
zfd.opened_path = NULL;
zend_stream_init_filename(&zfd, server->router);
zend_try {
zval retval;