From: Xinchen Hui <laruence@php.net>
Date: Fri, 31 Oct 2014 09:37:56 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~87^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccb09eb352ab440f61e8dbf43787f96503a008dc;p=php

Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_API.c
---

ccb09eb352ab440f61e8dbf43787f96503a008dc
diff --cc Zend/zend_API.c
index c6b34e03f1,a465721f1f..3643bfc8e2
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -2754,21 -2635,15 +2754,15 @@@ ZEND_API ZEND_FUNCTION(display_disabled
  }
  /* }}} */
  
- static zend_function_entry disabled_function[] = {
- 	ZEND_FE(display_disabled_function,			NULL)
- 	ZEND_FE_END
- };
- 
 -ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */
 +ZEND_API int zend_disable_function(char *function_name, size_t function_name_length TSRMLS_DC) /* {{{ */
  {
- 	int ret;
- 
- 	ret = zend_hash_str_del(CG(function_table), function_name, function_name_length);
- 	if (ret == FAILURE) {
- 		return FAILURE;
+ 	zend_internal_function *func;
 -	if (zend_hash_find(CG(function_table), function_name, function_name_length+1, (void **)&func)==SUCCESS) {
++	if ((func = zend_hash_str_find_ptr(CG(function_table), function_name, function_name_length))) {
+ 		func->arg_info = NULL;
+ 		func->handler = ZEND_FN(display_disabled_function);
+ 		return SUCCESS;
  	}
- 	disabled_function[0].fname = function_name;
- 	return zend_register_functions(NULL, disabled_function, CG(function_table), MODULE_PERSISTENT TSRMLS_CC);
+ 	return FAILURE;
  }
  /* }}} */