Changeset 357

Timestamp:

07/14/09 11:25:27 (1 year ago)

Author:

bart

Message:

Sync with hg repo:

changeset: 306:bea34af4acf3
user: bart@vanbrabant.eu
date: Tue Jul 14 10:13:35 2009 +0200
summary: Disable the optimizer for PHP 5.3 until it is fixed

changeset: 307:6df5e204e41c
tag: tip
user: bart@vanbrabant.eu
date: Tue Jul 14 11:18:44 2009 +0200
summary: Restore the class entry of a property info structure correctly.

Files:

• eaccelerator/trunk/ea_restore.c (modified) (1 diff)
• eaccelerator/trunk/optimize.c (modified) (1 diff)

eaccelerator/trunk/ea_restore.c

@@ -592 +592 @@
-        memcpy(to->doc_comment, from->doc_comment, from->doc_comment_len + 1);
-    }
-
+
+
-    to->ce = EAG(class_entry);
-# endif
-#endif
-    return to;

eaccelerator/trunk/optimize.c

@@ -3228 +3228 @@
-  BB* bb;
-
+#if defined(ZEND_ENGINE_2_3) && !defined(DEBUG)
+  // disable the optimizer for PHP 5.3
+  return;
+#endif
+
-#ifdef ZEND_ENGINE_2_3
-  ALLOCA_FLAG(use_heap)