Changeset 165

Timestamp:

02/19/06 20:04:12 (3 years ago)

Author:

hrak

Message:

Fixed inheritance/prototype issue with abstract methods and classes during restore. zend_do_inheritance handles these properly now.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ -2 +2 @@
-
-        * Restored PHP4 compatibility
+        * Fixed inheritance/prototype issue with abstract methods and classes during
+          restore. zend_do_inheritance handles these properly now.
-
-2006-02-18  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/ea_restore.c

@@ -811 +811 @@
-                                to->__call = f;
-                }
+                if (to->parent) {
+                        /* clear the child's prototype and IMPLEMENTED_ABSTRACT flag,
+                           these are properly restored by zend_do_inheritance() (see do_inherit_method_check) */
+                        f->common.prototype = NULL;
+                        f->common.fn_flags = f->common.fn_flags & (~ZEND_ACC_IMPLEMENTED_ABSTRACT);
+                }
-                efree(fname_lc);
-                p = p->pListNext;