]> granicus.if.org Git - php/commitdiff
Temporary fix for SIGFPE
authorXinchen Hui <laruence@php.net>
Thu, 7 May 2015 03:25:04 +0000 (11:25 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 7 May 2015 03:25:04 +0000 (11:25 +0800)
ext/opcache/zend_accelerator_module.c

index 11c0635090eab2bda1263fd34bc5ac4ee4e9c41d..0dd11c5ded201bf5c80cbd37f81b9a63bf411938 100644 (file)
@@ -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;