diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 16:44:46 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 16:44:46 +0200 |
commit | 3faa903d47d8ece5a6256cf175b9af868779b061 (patch) | |
tree | 86ef2d048952d53067e3bc59ada3ceb7f818bbab /sapi/apache2handler | |
parent | 72c6ea9cb8e84cd6630c198d4b9416dc4c57ca9c (diff) | |
parent | 49bac9b77bc9cacc0f984092d226e951ae336b43 (diff) | |
download | php-git-3faa903d47d8ece5a6256cf175b9af868779b061.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 7b9107e7fc..af2826b911 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); |