Changeset 158

Timestamp:

02/15/06 12:24:51 (2 years ago)

Author:

hrak

Message:

* PHP_5_1: Fixes for five failing tests found using the test suite created by Bart

Tests that failed where:

• ctor_dtor_inheritance (failed because construct, destruct and clone were not properly set)
  
• destructor_and_exceptions (failed because inheritance of parent methods was broken, fixed by making sure ea_store doesn't store methods outside scope)
  
• inheritance_002 (failed because construct, destruct and clone were not properly set)
  
• private_members (failed because construct, destruct and clone were not properly set)
  
• type_hinting_003 (failed because array_type_hint introduced in zend_arg_info in PHP-5.1 was ignored)
  

Files:

• eaccelerator/branches/PHP_5_1/ChangeLog (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/ea_restore.c (modified) (5 diffs)
• eaccelerator/branches/PHP_5_1/ea_store.c (modified) (7 diffs)

eaccelerator/branches/PHP_5_1/ChangeLog

@@ +1 @@
+2006-02-15  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Fixes for five failing tests found using the test suite created by Bart
+          Tests that failed where:
+          -ctor_dtor_inheritance (failed because __construct, __destruct and __clone were not properly set)
+          -destructor_and_exceptions (failed because inheritance of parent methods was broken, fixed by making sure ea_store doesn't store methods outside scope)
+          -inheritance_002 (failed because __construct, __destruct and __clone were not properly set)
+          -private_members (failed because __construct, __destruct and __clone were not properly set)
+          -type_hinting_003 (failed because array_type_hint introduced in zend_arg_info in PHP-5.1 was ignored)
+
-2006-02-14  Bart Vanbrabant <bart.vanbrabant at zoeloelip dot be>
-
-    
+       
-
-2006-02-07  Hans Rakers <hans at parse dot nl>

eaccelerator/branches/PHP_5_1/ea_restore.c

@@ -478 +478 @@
-
-        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-
-
+ type=%x
+, from->type
-
-        if (from->type == ZEND_INTERNAL_FUNCTION) {
@@ -599 +599 @@
-                        ea_debug_printf(EA_DEBUG, "[%d]                                       can't find\n", getpid());
-                }               
+#ifdef ZEND_ENGINE_2
+                /* hrak: slight memleak here. dont forget to free the lowercase function name! */
+                if (fname_lc != NULL) {
+                        efree(fname_lc);
+                }
+                /* zend_internal_function also contains return_reference in ZE2 */
+                to->return_reference = from->return_reference;
+                /* this gets set by zend_do_inheritance */
+                to->prototype = NULL;
+#endif
-                return to;
-        }
@@ -726 +736 @@
-                /* inherit parent methods */
-                to->parent = *parent_ptr;
+                to->parent->refcount++;
-                ea_debug_printf(EA_DEBUG, "restore_class_parent: found parent %s..\n", to->parent->name);
-                ea_debug_printf(EA_DEBUG, "restore_class_parent: parent type=%d child type=%d\n", to->parent->type, to->type);
-
-
-
+
-                to->destructor = to->parent->destructor;
-                to->clone = to->parent->clone;
-
+/*
-                to->__set = to->parent->__set;
-#  ifdef ZEND_ENGINE_2_1
@@ -929 +938 @@
-        }
-#endif
-        restore_hash(&to->function_table, &from->function_table,
-                                 (restore_bucket_t) restore_op_array_ptr TSRMLS_CC);
-        to->function_table.pDestructor = ZEND_FUNCTION_DTOR;
-
-        if (from->parent != NULL) {
-                restore_class_parent(from->parent, strlen(from->parent), to TSRMLS_CC);
@@ -941 +946 @@
-        }
-
+        restore_hash(&to->function_table, &from->function_table,
+                                 (restore_bucket_t) restore_op_array_ptr TSRMLS_CC);
+        to->function_table.pDestructor = ZEND_FUNCTION_DTOR;
+
-#ifdef ZEND_ENGINE_2
-        restore_class_methods(to TSRMLS_CC);
-#endif
+        if (to->parent)
+                zend_do_inheritance(to, to->parent TSRMLS_CC);
-        EAG(class_entry) = old;
-

eaccelerator/branches/PHP_5_1/ea_store.c

@@ -541 +541 @@
-
-        ea_debug_pad(EA_DEBUG TSRMLS_CC);
-
+ type=%x
-            getpid(), from->function_name ? from->function_name : "(top)",
-#ifdef ZEND_ENGINE_2
@@ -548 +548 @@
-                        "NULL"
-#endif
+                        , from->type
-                );
-
@@ -580 +581 @@
-                                to->arg_info[i].class_name_len = from->arg_info[i].class_name_len;
-                        }
+#  ifdef ZEND_ENGINE_2_1
+                        /* php 5.1 introduces this in zend_arg_info for array type hinting */
+                        to->arg_info[i].array_type_hint = from->arg_info[i].array_type_hint;
+#  endif
-                        to->arg_info[i].allow_null = from->arg_info[i].allow_null;
-                        to->arg_info[i].pass_by_reference = from->arg_info[i].pass_by_reference;
@@ -620 +625 @@
-#endif
-
-
-
+
+
+
+
+
+
+
-    
-        to->opcodes = from->opcodes;
@@ -811 +821 @@
-        return ZEND_HASH_APPLY_KEEP;
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-eaccelerator_class_entry *store_class_entry(zend_class_entry * from TSRMLS_DC)
@@ -866 +894 @@
-        store_hash(&to->properties_info, &from->properties_info, (store_bucket_t) store_property_info, (check_bucket_t) store_property_access_check, from);
-#  ifdef ZEND_ENGINE_2_1
+        ea_debug_printf(EA_DEBUG, "[%d] store_class_entry: from->static_members(%x), from->default_static_members(%x)\n", getpid(), from->static_members, &from->default_static_members);
-        if((from->static_members != NULL) && (from->static_members != &from->default_static_members)) {
-                store_zval_hash(&to->default_static_members, &from->default_static_members);
@@ -891 +920 @@
-        store_zval_hash(&to->default_properties, &from->default_properties);
-#endif
-NULL, NULL
+(check_bucket_t) store_function_inheritance_check, from
-
-#ifdef DEBUG