Changeset 348 for eaccelerator/trunk/ea_restore.c

Timestamp:

06/20/08 11:20:17 (7 months ago)

Author:

bart

Message:

First stab at php 5.3 support. Only fixes the script cache. phpMyAdmin seems to work with these changes.

Files:

• eaccelerator/trunk/ea_restore.c (modified) (4 diffs)

eaccelerator/trunk/ea_restore.c

@@ -50 +50 @@
-#endif
-
+#ifdef ZEND_ENGINE_2_3
+    #define RESET_PZVAL_REFCOUNT(z) Z_SET_REFCOUNT_P(z, 1)
+#else
+    #define RESET_PZVAL_REFCOUNT(z) (z)->refcount = 1;
+#endif
+
-/* pointer to the properties_info hashtable destructor */
-dtor_func_t properties_info_dtor = NULL;
@@ -277 +283 @@
-    restore_zval(p TSRMLS_CC);
-    /* hrak: reset refcount to make sure there is one reference to this val, and prevent memleaks */
-p->refcount = 1
+RESET_PZVAL_REFCOUNT(p)
-    return p;
-}
@@ -539 +545 @@
-    to->try_catch_array = from->try_catch_array;
-    to->last_try_catch = from->last_try_catch;
+#ifdef ZEND_ENGINE_2_3
+    to->this_var = from->this_var;
+#else
-    to->uses_this = from->uses_this;
+#endif
-
-    to->line_start = from->line_start;
@@ -556 +566 @@
-            Bucket *p = to->static_variables->pListHead;
-            while (p != NULL) {
-((zval *) (p->pDataPtr))->refcount = 1
+RESET_PZVAL_REFCOUNT((zval*) p->pDataPtr)
-                p = p->pListNext;
-            }