From 49bac9b77bc9cacc0f984092d226e951ae336b43 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 16 Jul 2019 16:40:54 +0200 Subject: Introduce zend_stream_init_filename() Avoid more ad-hoc initialization of zend_file_handle structures. --- sapi/apache2handler/sapi_apache2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sapi/apache2handler/sapi_apache2.c') diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 193420eca4..1cc5670eaa 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -694,11 +694,7 @@ zend_first_try { highlight_file((char *)r->filename, &syntax_highlighter_ini); } else { zend_file_handle zfd; - - zfd.type = ZEND_HANDLE_FILENAME; - zfd.filename = (char *) r->filename; - zfd.free_filename = 0; - zfd.opened_path = NULL; + zend_stream_init_filename(&zfd, (char *) r->filename); if (!parent_req) { php_execute_script(&zfd); -- cgit v1.2.1