Changeset 247

Timestamp:

07/27/06 11:43:59 (2 years ago)

Author:

bart

Message:

* Some fixes to make eAccelerator compile with php 5.2, this fixes bug #150
* Restore toString methods correctly with php 5.2

-This line, and those below, will be ignored--

M eaccelerator.h
M ea_restore.c
M ea_store.c
M ChangeLog?

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (1 diff)
• eaccelerator/trunk/ea_store.c (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.h (modified) (3 diffs)

eaccelerator/trunk/ChangeLog

@@ -5 +5 @@
-        * Killing the very broken encoder. Once when eAccelerator is in full
-          shape an encoder may return.
+        * Some fixes to make eAccelerator compile with php 5.2, this fixes bug #150
+        * Restore __toString methods correctly with php 5.2
-
-2006-07-25  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/ea_restore.c

@@ -773 +773 @@
-                                         memcmp(fname_lc, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)) == 0)
-                                to->__call = f;
+#  ifdef ZEND_ENGINE_2_2
+            else if (fname_len == sizeof(ZEND_TOSTRING_FUNC_NAME) - 1 &&
+                     memcmp(fname_lc, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)) == 0)
+                to->__tostring = f;
+#  endif
-                }
-                if (to->parent) {

eaccelerator/trunk/ea_store.c

@@ -777 +777 @@
-        if (parent) {
-                /* unpack the \0classname\0membername\0 style property name to seperate vars */
+#ifdef ZEND_ENGINE_2_2
+                zend_unmangle_property_name(p->arKey, p->nKeyLength, &cname, &mname);
+#else
-                zend_unmangle_property_name(p->arKey, &cname, &mname);
+#endif
-        
-                /* lookup the member's info in parent and child */

eaccelerator/trunk/eaccelerator.h

@@ -44 +44 @@
-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1
-#   define ZEND_ENGINE_2_1
+#endif
+
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2
+#   define ZEND_ENGINE_2_2
-#endif
-
@@ -356 +360 @@
-} eaccelerator_cache_place;
-
+#ifndef align_union
-typedef union align_union {
-  double d;
@@ -362 +367 @@
-  long l;
-} align_union;
+#endif
+
+typedef union _align_test {
+  void *ptr;
+  double dbl;
+  long lng;
+} align_test;
-
-/******************************************************************************/