Changeset 296 in svn for trunk

Timestamp:

2006-12-03T02:57:37Z (12 years ago)

Author:

Xuefer

Message:

fixed compatibility with zo under apache 1.x

File:

• trunk/xcache.c (modified) (3 diffs)

trunk/xcache.c

@@ -2358 +2358 @@
     zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension);
 
-    zend_llist_add_element(&zend_extensions, &extension);
+    zend_llist_prepend_element(&zend_extensions, &extension);
 #ifdef DEBUG
     fprintf(stderr, "registered\n");
@@ -2432 +2432 @@
     xc_module_gotup = 1;
     if (!xc_zend_extension_gotup) {
-        if (zend_get_extension(XCACHE_NAME) == NULL) {
-            xc_zend_extension_register(&zend_extension_entry, 0);
-            xc_zend_extension_startup(&zend_extension_entry);
-            xc_zend_extension_faked = 1;
-        }
+        xc_zend_extension_register(&zend_extension_entry, 0);
+        xc_zend_extension_startup(&zend_extension_entry);
+        xc_zend_extension_faked = 1;
     }
 
@@ -2632 +2630 @@
 ZEND_DLEXPORT int xcache_zend_startup(zend_extension *extension) /* {{{ */
 {
-    if (xc_zend_extension_gotup) {
-        return SUCCESS;
-    }
     xc_zend_extension_gotup = 1;
     xc_llist_element = NULL;