Changeset 195

Timestamp:

04/06/06 18:49:25 (3 years ago)

Author:

hans

Message:

Fixed handling of interfaces. This fixes sf.net bug #1440575

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (1 diff)
• eaccelerator/trunk/ea_store.c (modified) (3 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-04-06  Hans Rakers <hans at parse dot nl>
+
+        * Fixed handling of interfaces. This fixes sf.net bug #1440575.
+          This fix also introduces some changes in the cached object structure
+          so remember to empty your disk caches if you have them. This is
+          always a good thing to do after upgrading btw :)
+
-2006-04-06  Hans Rakers <hans at parse dot nl>
-

eaccelerator/trunk/ea_restore.c

@@ -827 +827 @@
-        to->ce_flags = from->ce_flags;
-        to->num_interfaces = from->num_interfaces;
+        to->interfaces = NULL;
+
-        if (to->num_interfaces > 0) {
-                /* hrak: Allocate the slots which will later be populated by ZEND_ADD_INTERFACE */
-                to->interfaces = (zend_class_entry **) emalloc(sizeof(zend_class_entry *) * to->num_interfaces);
-                memset(to->interfaces, 0, sizeof(zend_class_entry *) * to->num_interfaces);
-
-
-
-
-
-
-
-
+
-#endif
-

eaccelerator/trunk/ea_store.c

@@ -837 +837 @@
-{
-        eaccelerator_class_entry *to;
+        unsigned int i;
+
-        EACCELERATOR_ALIGN(EAG(mem));
-        to = (eaccelerator_class_entry *) EAG(mem);
@@ -847 +849 @@
-        to->ce_flags = from->ce_flags;
-        to->static_members = NULL;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-
@@ -870 +885 @@
-        to->line_end = from->line_end;
-        to->doc_comment_len = from->doc_comment_len;
-        to->iterator_funcs = from->iterator_funcs;
-        to->create_object = from->create_object;
-        to->get_iterator = from->get_iterator;
-        to->interface_gets_implemented = from->interface_gets_implemented;
-
-        if (from->filename != NULL)

eaccelerator/trunk/eaccelerator.h

@@ -240 +240 @@
-        zend_uint num_interfaces;
-
-        char **interfaces;
-        zend_class_iterator_funcs iterator_funcs;
-
-        /* handlers */
-        zend_object_value (*create_object) (zend_class_entry *class_type TSRMLS_DC);
-        zend_object_iterator *(*get_iterator) (zend_class_entry *ce, zval *object TSRMLS_DC);
-        int (*interface_gets_implemented) (zend_class_entry *iface, zend_class_entry *class_type TSRMLS_DC);    /* a class implements this interface */
-
-        /* hra: serializer callbacks may need to be added here in the future for php 5.1 */
-
-        char *filename;
-        zend_uint line_start;