Changeset 1252 in svn for branches/3.0

Timestamp:

2013-05-27T15:01:50Z (3 years ago)

Author:

Xuefer

Message:

fixes #307: compatible with Zend Debugger which requires to be installed after Zend Extension Manager

Location:

branches/3.0

Files:

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

branches/3.0/ChangeLog

@@ -6 +6 @@
  * fixes #296: Multiple instances of the same software causes PHP "cannot redeclare class" errors when readonly_protection is not in use
  * fixes #301: refix locking impl
+ * fixes #307: compatible with Zend Debugger which requires to be installed after Zend Extension Manager
 
 3.0.1 2013-01-11

branches/3.0/NEWS

@@ -3 +3 @@
  * bug fixes
  * "cannot redeclare class" errors is now gone. Can also be avoid by using readonly_protection (unavailable with /dev/zero).
+ * fixes SEGV with Zend Debugger
 
 3.0.1 2013-01-11

branches/3.0/xcache.c

@@ -56 +56 @@
 }
 /* }}} */
+
+/* devel helper function */
+#if 0
+static void xc_list_extensions() /* {{{ */
+{
+    zend_llist_element *element;
+    zend_extension *ext;
+    fprintf(stderr, "extensions:\n");
+    for (element = zend_extensions.head; element; element = element->next) {
+        ext = (zend_extension *) element->data;
+        fprintf(stderr, " - %s\n", ext->name);
+    }
+}
+/* }}} */
+#endif
 
 /* module helper function */
@@ -567 +582 @@
 } xc_incompatible_zend_extension_info_t;
 static xc_incompatible_zend_extension_info_t xc_incompatible_zend_extensions[] = {
+    { "Zend Extension Manager", NULL },
     { "Zend Optimizer", NULL },
     { "the ionCube PHP Loader", NULL }
 };
-zend_llist_element **xc_zend_extension_elements;
 
 static xc_incompatible_zend_extension_info_t *xc_get_incompatible_zend_extension_info(const char *name)
@@ -603 +618 @@
     int status;
     zend_bool catched = 0;
-    zend_llist old_zend_extensions;
+    zend_llist saved_zend_extensions_container; /* without elements */
+    zend_llist_element **saved_zend_extensions_elments;
+    size_t new_zend_extensions_elments_count;
+    zend_llist_element **new_zend_extensions_elments;
     zend_extension *ext;
     size_t i;
@@ -609 +627 @@
     TSRMLS_FETCH();
 
-    /* restore */
+    /* restore startup hack */
     extension->startup = incompatible_zend_extension_info->old_startup;
     incompatible_zend_extension_info->old_startup = NULL;
     assert(extension->startup);
 
-    /* save */
-    assert(!xc_zend_extension_elements);
-    old_zend_extensions = zend_extensions;
-    xc_zend_extension_elements = malloc(sizeof(zend_llist_element *) * old_zend_extensions.count);
-    for (i = 0, element = old_zend_extensions.head; element; ++i, element = element->next) {
-        xc_zend_extension_elements[i] = element;
+    /* save extensions list */
+    saved_zend_extensions_container = zend_extensions;
+    saved_zend_extensions_elments = malloc(sizeof(zend_llist_element *) * saved_zend_extensions_container.count);
+    for (i = 0, element = saved_zend_extensions_container.head; element; ++i, element = element->next) {
+        saved_zend_extensions_elments[i] = element;
     }
 
@@ -627 +644 @@
     zend_extensions.count = 0;
 
-    for (i = 0; i < old_zend_extensions.count; ++i) {
-        element = xc_zend_extension_elements[i];
+    for (i = 0; i < saved_zend_extensions_container.count; ++i) {
+        element = saved_zend_extensions_elments[i];
         element->next = element->prev = NULL;
 
@@ -646 +663 @@
     } zend_end_try();
 
-    /* restore */
-    zend_extensions = old_zend_extensions;
+    /* save newly added extensions added by this extension*/
+    new_zend_extensions_elments_count = zend_extensions.count - 1;
+    new_zend_extensions_elments = NULL;
+    if (new_zend_extensions_elments_count) {
+        new_zend_extensions_elments = malloc(sizeof(zend_llist_element *) * new_zend_extensions_elments_count);
+        element = zend_extensions.head;
+        for (i = 0, element = element->next; element; ++i, element = element->next) {
+            new_zend_extensions_elments[i] = element;
+        }
+    }
+
+    /* restore original extension list*/
+    zend_extensions = saved_zend_extensions_container;
     zend_extensions.head = NULL;
     zend_extensions.tail = NULL;
     zend_extensions.count = 0;
-    for (i = 0; i < old_zend_extensions.count; ++i) {
-        element = xc_zend_extension_elements[i];
+    for (i = 0; i < saved_zend_extensions_container.count; ++i) {
+        element = saved_zend_extensions_elments[i];
         element->next = element->prev = NULL;
 
         xc_zend_llist_add_element(&zend_extensions, element);
         ++zend_extensions.count;
-    }
-
-    free(xc_zend_extension_elements);
-    xc_zend_extension_elements = NULL;
+
+        ext = (zend_extension *) element->data;
+        if (ext == extension && new_zend_extensions_elments_count) {
+            /* add new created extension */
+            size_t j;
+            for (j = 0; j < new_zend_extensions_elments_count; ++j) {
+                element = new_zend_extensions_elments[j];
+                element->next = element->prev = NULL;
+
+                xc_zend_llist_add_element(&zend_extensions, element);
+                ++zend_extensions.count;
+            }
+        }
+    }
+    free(saved_zend_extensions_elments);
+    if (new_zend_extensions_elments) {
+        free(new_zend_extensions_elments);
+    }
 
     if (catched) {