Changeset 1163

Timestamp:

11/06/2012 03:41:16 AM (6 months ago)

Author:

moo

Message:

compatible with "the ionCube PHP Loader"

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• xcache.c (modified) (4 diffs)

trunk/ChangeLog

@@ -3 +3 @@
 ========
  * fixed #290: workaround phpize vs fbsd make bug again
+ * compatible with "the ionCube PHP Loader"
 
 3.0.0 2012-10-29

trunk/NEWS

@@ -3 +3 @@
 ========
  * bug fixes
+ * compatible with "the ionCube PHP Loader"
 
 3.0.0 2012-10-29

trunk/xcache.c

@@ -561 +561 @@
 } xc_incompatible_zend_extension_info_t;
 static xc_incompatible_zend_extension_info_t xc_incompatible_zend_extensions[] = {
-    { "Zend Optimizer", NULL }
+    { "Zend Optimizer", NULL },
+    { "the ionCube PHP Loader", NULL }
 };
 
@@ -584 +585 @@
     zend_bool catched = 0;
     zend_llist old_zend_extensions = zend_extensions;
-    TSRMLS_FETCH();
-
-    /* hide all extensions from it */
-    zend_extensions.head = NULL;
-    zend_extensions.count = 0;
 
     /* restore */
@@ -595 +591 @@
     assert(extension->startup);
 
+    /* hide all extensions from it */
+    zend_extensions.head = NULL;
+    zend_extensions.tail = NULL;
+    zend_extensions.count = 0;
+    zend_extensions.dtor = NULL;
+    zend_llist_add_element(&zend_extensions, extension);
+    extension = zend_get_extension(extension->name);
+
+    assert(extension->startup != xc_incompatible_zend_extension_startup_hook);
     zend_try {
         status = extension->startup(extension);
@@ -601 +606 @@
     } zend_end_try();
 
+    /* restore */
     zend_extensions = old_zend_extensions;
     if (catched) {