From: Xinchen Hui <laruence@php.net>
Date: Sat, 4 Aug 2012 03:14:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d289efb45771217a826f10def835a6185683a1eb;p=php

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	Zend/zend_API.h
---

d289efb45771217a826f10def835a6185683a1eb
diff --cc Zend/zend_API.c
index 98a33e5445,16a940dcac..827446b26d
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@@ -2547,16 -2342,16 +2547,15 @@@ static const zend_function_entry disabl
  
  ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC) /* {{{ */
  {
- 	zend_class_entry disabled_class;
+ 	zend_class_entry **disabled_class;
  
  	zend_str_tolower(class_name, class_name_length);
- 	if (zend_hash_del(CG(class_table), class_name, class_name_length+1)==FAILURE) {
+ 	if (zend_hash_find(CG(class_table), class_name, class_name_length+1, (void **)&disabled_class)==FAILURE) {
  		return FAILURE;
  	}
- 	INIT_OVERLOADED_CLASS_ENTRY_EX(disabled_class, class_name, class_name_length, disabled_class_new, NULL, NULL, NULL, NULL, NULL);
- 	disabled_class.create_object = display_disabled_class;
- 	disabled_class.name_length = class_name_length;
- 	zend_register_internal_class(&disabled_class TSRMLS_CC);
+ 	INIT_CLASS_ENTRY_INIT_METHODS((**disabled_class), disabled_class_new, NULL, NULL, NULL, NULL, NULL);
+ 	(*disabled_class)->create_object = display_disabled_class;
 -	(*disabled_class)->builtin_functions = disabled_class_new;
+ 	zend_hash_clean(&((*disabled_class)->function_table));
  	return SUCCESS;
  }
  /* }}} */
diff --cc Zend/zend_API.h
index f54db7f2e8,ddd84fa584..d7fbc3c3af
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@@ -168,13 -167,15 +168,18 @@@ typedef struct _zend_fcall_info_cache 
  
  #define INIT_OVERLOADED_CLASS_ENTRY_EX(class_container, class_name, class_name_len, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
  	{															\
 +		const char *cl_name = class_name;								\
  		int _len = class_name_len;								\
 -		class_container.name = zend_strndup(class_name, _len);	\
 +		class_container.name = zend_new_interned_string(cl_name, _len+1, 0 TSRMLS_CC);	\
 +		if (class_container.name == cl_name) {					\
 +			class_container.name = zend_strndup(cl_name, _len);	\
 +		}														\
  		class_container.name_length = _len;						\
+ 		INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
+ 	}
+ 
+ #define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
+ 	{															\
 -		class_container.builtin_functions = functions;			\
  		class_container.constructor = NULL;						\
  		class_container.destructor = NULL;						\
  		class_container.clone = NULL;							\