com php-src: Temporary fix for SIGFPE: ext/opcache/zend_accel erator_module.c

Commit: 809616c9da10e749ea3770b4c3b8e4907c7e0992 Author: Xinchen Hui <laruence@php.net> Thu, 7 May 2015 11:25:04 +0800 Parents: 3abde432314787f697533c88e7afd64946676306 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=809616c9da10e749ea3770b4c3b8e4907c7e0992 Log: Temporary fix for SIGFPE Changed paths: M ext/opcache/zend_accelerator_module.c Diff: diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 11c0635..0dd11c5 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -394,6 +394,10 @@ void zend_accel_override_file_functions(void) { zend_function *old_function; if (ZCG(enabled) && accel_startup_ok && ZCG(accel_directives).file_override_enabled) { + if (ZCG(accel_directives).file_cache_only) { + zend_accel_error(ACCEL_LOG_WARNING, "file_override_enabled has no effect when file_cache_only is set"); + return; + } /* override file_exists */ if ((old_function = zend_hash_str_find_ptr(CG(function_table), "file_exists", sizeof("file_exists")-1)) != NULL) { orig_file_exists = old_function->internal_function.handler;