Changeset 161

Timestamp:

02/17/06 17:32:29 (2 years ago)

Author:

hrak

Message:

* PHP_5_1: Some final fixes before merging to HEAD:

• Fixed bug #1410723 (handling of class constants by the optimizer)
  
• Fixed backwards compatibility with php < 5.1
  

Files:

• eaccelerator/branches/PHP_5_1/ChangeLog (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/ea_store.c (modified) (1 diff)
• eaccelerator/branches/PHP_5_1/optimize.c (modified) (1 diff)

eaccelerator/branches/PHP_5_1/ChangeLog

@@ +1 @@
+2006-02-17  Hans Rakers <hans at parse dot nl>
+
+        * PHP_5_1: Some final fixes before merging to HEAD:
+          - Fixed bug #1410723 (handling of class constants by the optimizer)
+          - Fixed backwards compatibility with PHP < 5.1
+
+          This revision works pretty well in my testing environment, PHP-5.1 support
+          seems to be coming along quite well. Please test with your applications/
+          in your environment and report back with your experiences or possible problems!
+
-2006-02-15  Hans Rakers <hans at parse dot nl>
-

eaccelerator/branches/PHP_5_1/ea_store.c

@@ -808 +808 @@
-                        }
-                        /* If the static member points to the same value in parent and child, remove for proper inheritance during restore */
+#  ifdef ZEND_ENGINE_2_1
-                        if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
+#  else
+                        if(zend_hash_quick_find(&parent->static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
+#  endif
-                                ea_debug_printf(EA_DEBUG, "[%d] store_static_member_access_check: SUCCESS looking up arKey\n",getpid());
-                                ea_debug_printf(EA_DEBUG, "[%d] store_static_member_access_check: pprop=%x cprop=%x\n",getpid(), *pprop, *cprop);

eaccelerator/branches/PHP_5_1/optimize.c

@@ -3224 +3224 @@
-          if (op->opcode == ZEND_DO_FCALL_BY_NAME) {
-            op->op1.op_type = IS_UNUSED;
+          } else if (op->opcode == ZEND_FETCH_CONSTANT) {
+            op->op1.u.var = VAR_VAL(assigned[r]);
+            op->op1.op_type = IS_CONST;
-          } else {
-            op->op1.u.var = VAR_VAL(assigned[r]);