Changeset 411 for eaccelerator/trunk

Timestamp:

02/25/10 11:54:31 (5 months ago)

Author:

hans

Message:

• Fixed class static variable restore where parent was protected
  static and child was public static. This would lead to error
  'Access to undeclared static property' upon restore from cache
  
• Added proper handling of class properties during storing in
  cache. Public/private/protected is properly handled now. Somehow
  this was a long overdue TODO spotted by running the testsuite.
  This fixes ticket #408
  
• Small fix that solves some issues with lambda (closure)
  functions. This solves ticket #405
  

Files:

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

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2010-02-25      Hans Rakers <hans at react.nl>
+
+                * Fixed class static variable restore where parent was protected
+                  static and child was public static. This would lead to error
+                  'Access to undeclared static property' upon restore from cache
+                * Added proper handling of class properties during storing in
+                  cache. Public/private/protected is properly handled now. Somehow
+                  this was a long overdue TODO spotted by running the testsuite.
+                  This fixes ticket #408
+                * Small fix that solves some issues with lambda (closure)
+                  functions. This solves ticket #405
+
-2010-02-24      Hans Rakers <hans at react.nl>
-

eaccelerator/trunk/ea_store.c

@@ -672 +672 @@
- *
- * Most of the logic behind all this can be found in zend_compile.c, functions zend_do_inheritance and
-zend_
+
-*/
-static int store_property_access_check(Bucket * p, zend_class_entry * from_ce)
@@ -678 +678 @@
-    zend_class_entry *from = from_ce;
-    zend_class_entry *parent = from->parent;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return ZEND_HASH_APPLY_KEEP;
@@ -714 +723 @@
-        if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, &pinfo.ptr) == SUCCESS) &&
-            (zend_hash_find(&from->properties_info, mname, strlen(mname)+1, &cinfo.ptr) == SUCCESS)) {
-            /* don't copy this static property if protected in parent and static public in child.
-               inheritance will handle this properly on restore */
-            if(cinfo.v->flags & ZEND_ACC_STATIC && (pinfo.v->flags & ZEND_ACC_PROTECTED && cinfo.v->flags & ZEND_ACC_PUBLIC)) {
-                return ZEND_HASH_APPLY_REMOVE;
-            }
-            /* If the static member points to the same value in parent and child, remove for proper inheritance during restore */
-            if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {

eaccelerator/trunk/opcodes.c

@@ -220 +220 @@
-  OPDEF("UNDEF-151",                EXT_UNUSED | OP1_UNUSED | OP2_UNUSED | RES_UNUSED), /* 151 */
-  OPDEF("JMP_SET",                  EXT_UNUSED | OP1_STD    | OP2_JMPADDR| RES_TMP),    /* 152 */
-UNUSED)
+TMP)   
-# endif
-};