diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-05-16 13:22:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-05-16 13:22:43 +0800 |
| commit | e04b91e6e24ad9646e9fe4c4503b18bb4435fe3a (patch) | |
| tree | 3deb91925db2f23652806a8416b1668047a44a74 | |
| parent | 8ec91086ee56700ef53797cc242169b83905f6fb (diff) | |
| parent | 89dd7fb328589a9aa1719aa7c642a1378c5a926e (diff) | |
| download | php-git-e04b91e6e24ad9646e9fe4c4503b18bb4435fe3a.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index d316fd83f4..12c86dbe0e 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1712,7 +1712,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type) return accelerator_orig_compile_file(file_handle, type); } persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length); + } else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) { + return accelerator_orig_compile_file(file_handle, type); } + if (!persistent_script) { /* try to find cached script by full real path */ zend_accel_hash_entry *bucket; |