From 5c31c8c6e5118892537dca319a9fd2d23b95d0da Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@php.net>
Date: Sat, 28 Mar 2015 17:07:11 +0800
Subject: [PATCH] Fixed is_callable/function_exists with disable_functions

---
 Zend/tests/bug69315.phpt        | 2 +-
 ext/opcache/Optimizer/pass1_5.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Zend/tests/bug69315.phpt b/Zend/tests/bug69315.phpt
index 91f7ad8c67..71dac4298f 100644
--- a/Zend/tests/bug69315.phpt
+++ b/Zend/tests/bug69315.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69315 (disable_functions behaviors inconsistently)
 --INI--
-disable_functions=strlen,defined,call_user_func,constant,is_callable,is_string
+disable_functions=strlen,defined,call_user_func,constant,is_string
 --FILE--
 <?php
 
diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c
index ef62d99535..c042940b0e 100644
--- a/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@ -431,10 +431,12 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 			    Z_TYPE(ZEND_OP1_LITERAL(send1_opline)) == IS_STRING) {
 				if ((Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("function_exists")-1 &&
 					!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
-						"function_exists", sizeof("function_exists")-1)) ||
+						"function_exists", sizeof("function_exists")-1) &&
+					!zend_optimizer_is_disabled_func("function_exists", sizeof("function_exists") - 1)) ||
 					(Z_STRLEN(ZEND_OP2_LITERAL(init_opline)) == sizeof("is_callable")-1 &&
 					!memcmp(Z_STRVAL(ZEND_OP2_LITERAL(init_opline)),
-						"is_callable", sizeof("is_callable")))) {
+						"is_callable", sizeof("is_callable")) &&
+					!zend_optimizer_is_disabled_func("is_callable", sizeof("is_callable") - 1))) {
 					zend_internal_function *func;
 					zend_string *lc_name = zend_string_tolower(
 							Z_STR(ZEND_OP1_LITERAL(send1_opline)));
-- 
2.50.1