]> granicus.if.org Git - php/commitdiff
We don't cache custom strems with callbacks anymore
authorDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:25:30 +0000 (19:25 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:25:30 +0000 (19:25 +0300)
ext/opcache/ZendAccelerator.c

index 547814cd2e660f4f52ffeb432ef711ee4a34e7ce..1bf457936e8d2b6dbdc9e5153688d634936abdcd 100644 (file)
@@ -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) {