com php-src: We don't cache custom strems with callbacks anymore: ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Tue, 10 Mar 2015 16:25:30 +0000 |
| Subject: | com php-src: We don't cache custom strems with callbacks anymore: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85445@lists.php.net to get a copy of this message | ||
Commit: c814b3294ad72baad8d9da52dbef81dcafded451
Author: Dmitry Stogov <dmitry@zend.com> Tue, 10 Mar 2015 19:25:30 +0300
Parents: f074870f4e39e3dc1b8978024b3682ab43d3e8e5
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c814b3294ad72baad8d9da52dbef81dcafded451
Log:
We don't cache custom strems with callbacks anymore
Changed paths:
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 547814c..1bf4579 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -1323,23 +1323,6 @@ static zend_persistent_script *compile_and_cache_file(zend_file_handle
*file_han
return NULL;
}
-#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
- if (file_handle->type == ZEND_HANDLE_STREAM &&
- (!strstr(file_handle->filename, ".phar") ||
- strstr(file_handle->filename, "://"))) {
- char *buf;
- size_t size;
-
- /* Stream callbacks needs to be called in context of original
- * function and class tables (see: https://bugs.php.net/bug.php?id=64353)
- */
- if (zend_stream_fixup(file_handle, &buf, &size TSRMLS_CC) == FAILURE) {
- *op_array_p = NULL;
- return NULL;
- }
- }
-#endif
-
if (ZCG(accel_directives).validate_timestamps ||
ZCG(accel_directives).file_update_protection ||
ZCG(accel_directives).max_file_size > 0) {