diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-30 22:57:07 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-30 22:57:07 +0100 |
| commit | d5c886ab7deef065c8119aaa545332041f13fe18 (patch) | |
| tree | bb33dc724d134c05e69d30c03d71d0aab8255349 /Zend/zend_execute.c | |
| parent | 48b44612d4e3f2201aa3d069aedb89df7e0d1668 (diff) | |
| parent | f77747b06c7623c4f673c75aebbe3372411a4275 (diff) | |
| download | php-git-d5c886ab7deef065c8119aaa545332041f13fe18.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Properly propagate url_stat exceptions during include
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6620a71e91..4821e2a1e4 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -4159,6 +4159,8 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval if (zend_hash_exists(&EG(included_files), resolved_path)) { goto already_compiled; } + } else if (UNEXPECTED(EG(exception))) { + break; } else if (UNEXPECTED(strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename))) { zend_message_dispatcher( (type == ZEND_INCLUDE_ONCE) ? |