com php-src: Fixed segfault if opcache is disabled and with file_cache: ext/opcache/ZendAccelerator.c

From: Date: Wed, 15 Jul 2015 02:38:23 +0000
Subject: com php-src: Fixed segfault if opcache is disabled and with file_cache: ext/opcache/ZendAccelerator.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87994@lists.php.net to get a copy of this message
Commit: 32a4507abc2331712ae4a2d921467f5afbab701c Author: Xinchen Hui <laruence@php.net> Wed, 15 Jul 2015 10:38:23 +0800 Parents: 453ec91dfe0ce53e1867241625958f27fbee17d2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=32a4507abc2331712ae4a2d921467f5afbab701c Log: Fixed segfault if opcache is disabled and with file_cache Changed paths: M ext/opcache/ZendAccelerator.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index b1feb54..01e9eca 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1068,15 +1068,6 @@ int zend_accel_invalidate(const char *filename, int filename_len, zend_bool forc zend_persistent_script *persistent_script; if (!ZCG(enabled) || !accel_startup_ok || !ZCSG(accelerator_enabled) || accelerator_shm_read_lock() != SUCCESS) { -#ifdef HAVE_OPCACHE_FILE_CACHE - if (ZCG(accel_directives).file_cache) { - realpath = accelerator_orig_zend_resolve_path(filename, filename_len); - if (realpath) { - zend_file_cache_invalidate(realpath); - zend_string_release(realpath); - } - } -#endif return FAILURE; }

« previous php.cvs (#87994) next »