Changeset 166

Timestamp:

02/20/06 00:54:12 (3 years ago)

Author:

hrak

Message:

Fixed static_members handling for php-5.0. Broke this while working on PHP-5.1 support. Lost in ifdef statements ;)

Files:

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

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-02-20  Hans Rakers <hans at parse dot nl>
+
+        * Fixed static_members handling for php-5.0. Broke this while
+          working on PHP-5.1 support. Lost in ifdef statements ;)
+
-2006-02-19  Hans Rakers <hans at parse dot nl>
-

eaccelerator/trunk/ea_store.c

@@ -811 +811 @@
-                        if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
-#  else
-&
+
-#  endif
-                                ea_debug_printf(EA_DEBUG, "[%d] store_static_member_access_check: SUCCESS looking up arKey\n",getpid());
@@ -913 +913 @@
-        }
-        ea_debug_printf(EA_DEBUG, "[%d] store_class_entry: to->static_members(%x), to->default_static_members(%x)\n", getpid(), to->static_members, &to->default_static_members);
+#  elif defined(ZEND_ENGINE_2) && !defined(ZEND_ENGINE_2_1)
+        /* for php-5.0 */
+        if(from->static_members != NULL) {
+                EACCELERATOR_ALIGN(EAG(mem));
+                to->static_members = (HashTable *) EAG(mem);
+                EAG(mem) += sizeof(HashTable);
+                store_hash(to->static_members, from->static_members, (store_bucket_t) store_zval_ptr, (check_bucket_t) store_static_member_access_check, from);
+        }       
-#  else
+        /* for php < 5.0 */
-        if (from->static_members != NULL) {
-                EACCELERATOR_ALIGN(EAG(mem));