cvs: ZendEngine2 / zend_compile.c
| From: | Derick Rethans | Date: | Fri, 29 Mar 2002 12:34:25 +0000 |
| Subject: | cvs: ZendEngine2 / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-45@lists.php.net to get a copy of this message | ||
derick Fri Mar 29 07:34:25 2002 EDT
Modified files:
/ZendEngine2 zend_compile.c
Log:
- revert patch
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.282 ZendEngine2/zend_compile.c:1.283
--- ZendEngine2/zend_compile.c:1.282 Mon Mar 25 15:37:02 2002
+++ ZendEngine2/zend_compile.c Fri Mar 29 07:34:25 2002
@@ -924,9 +924,7 @@
op_array.scope = CG(active_class_entry);
if (is_method) {
- if (zend_hash_add(&CG(active_class_entry)->function_table, name, name_len+1,
&op_array, sizeof(zend_op_array), (void **) &CG(active_op_array)) == FAILURE) {
- zend_error(E_ERROR, "Cannot redeclare method %s()", name);
- }
+ zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array,
sizeof(zend_op_array), (void **) &CG(active_op_array));
if ((CG(active_class_entry)->name_length == (uint) name_len) &&
(!memcmp(CG(active_class_entry)->name, name, name_len))) {
CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array);
} else if ((function_name->u.constant.value.str.len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1)
&& (!memcmp(function_name->u.constant.value.str.val, ZEND_CONSTRUCTOR_FUNC_NAME,
sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)))) {