Merge branch 'PHP-7.4'

This commit is contained in:
Nikita Popov 2019-07-16 16:44:46 +02:00
commit 3faa903d47
16 changed files with 69 additions and 142 deletions

View file

@ -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);