From 4b16082e94d01dd855b2bf8e86a60231b4e8eba4 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 9 Dec 2015 13:34:45 +0300 Subject: [PATCH] More verbose error messages --- ext/opcache/zend_file_cache.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c index 993358bdf5..ea1db0cd38 100644 --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -1241,9 +1241,16 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl } /* verify header */ - if (memcmp(info.magic, "OPCACHE", 8) != 0 || - memcmp(info.system_id, ZCG(system_id), 32) != 0) { - zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s'\n", filename); + if (memcmp(info.magic, "OPCACHE", 8) != 0) { + zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s' (wrong header)\n", filename); + zend_file_cache_flock(fd, LOCK_UN); + close(fd); + unlink(filename); + efree(filename); + return NULL; + } + if (memcmp(info.system_id, ZCG(system_id), 32) != 0) { + zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot read from file '%s' (wrong \"system_id\")\n", filename); zend_file_cache_flock(fd, LOCK_UN); close(fd); unlink(filename); -- 2.50.1