Changeset 348

Timestamp:

06/20/08 11:20:17 (5 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/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (4 diffs)
• eaccelerator/trunk/ea_store.c (modified) (3 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (2 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ -1 @@
-
+
+
+
+
+
+
-
-        * Remove support for all php versions older than php 5.1

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;
-            }

eaccelerator/trunk/ea_store.c

@@ -47 +47 @@
-inline
-#endif
+#ifdef ZEND_ENGINE_2_3
+static size_t calc_string(const char *str, int len TSRMLS_DC)
+#else
-static size_t calc_string(char *str, int len TSRMLS_DC)
+#endif
-{
-    if (len > MAX_DUP_STR_LEN || 
@@ -324 +328 @@
-    EACCELERATOR_ALIGN((*at));
-
+#ifdef ZEND_ENGINE_2_3
+static inline char *store_string(char **at, const char *str, int len TSRMLS_DC)
+#else
-static inline char *store_string(char **at, char *str, int len TSRMLS_DC)
+#endif
-{
-    char *p;
@@ -553 +561 @@
-    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
-    if (from->try_catch_array != NULL) {
-        to->try_catch_array = (zend_try_catch_element *)ALLOCATE(at, sizeof(zend_try_catch_element) * from->last_try_catch);

eaccelerator/trunk/eaccelerator.c

@@ -1103 +1103 @@
-}
-
+/* copy of zend_class_add_ref, the linker isn't able to link to it any more
+ * in php 5.3
+ * TODO: see if we can steal the pointer
+ */
+void ea_class_add_ref(zend_class_entry **ce)
+{
+            (*ce)->refcount++;
+}
+
-/*
- * Intercept compilation of PHP file.  If we already have the file in
@@ -1224 +1233 @@
-
-    zend_hash_init_ex(&tmp_class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-zend
+ea
-
-    orig_class_table = CG(class_table);;

eaccelerator/trunk/eaccelerator.h

@@ -198 +198 @@
-typedef struct _eaccelerator_op_array {
-        zend_uchar type;
+#ifdef ZEND_ENGINE_2_3
+    zend_uint this_var;
+#else
-        zend_bool uses_this;
+#endif
-        zend_bool return_reference;
-        zend_uint num_args;