From: Xinchen Hui <laruence@php.net>
Date: Thu, 7 May 2015 03:25:04 +0000 (+0800)
Subject: Temporary fix for SIGFPE
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809616c9da10e749ea3770b4c3b8e4907c7e0992;p=php

Temporary fix for SIGFPE
---

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 11c0635090..0dd11c5ded 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;