Changeset 972 for trunk/xcache.c

Timestamp:

2012-07-14T04:58:47+02:00 (10 months ago)

Author:

moo

Message:

closes #164: warning/error when xcache.so is loaded incorrectly

File:

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

trunk/xcache.c

@@ -3825 +3825 @@
     xc_module_gotup = 1;
     if (!xc_zend_extension_gotup) {
+        zend_error(E_WARNING, "XCache is designed to be loaded as zend_extension not extension");
         xc_zend_extension_register(&zend_extension_entry, 0);
         xc_zend_extension_startup(&zend_extension_entry);
@@ -4040 +4041 @@
 static int xc_zend_startup_last(zend_extension *extension) /* {{{ */
 {
+    zend_extension *ext = zend_get_extension(XCACHE_NAME);
+    if (ext) {
+        zend_error(E_WARNING, "Module '" XCACHE_NAME "' already loaded");
+    }
     /* restore */
     extension->startup = xc_last_ext_startup;
@@ -4069 +4074 @@
 
         xc_llist_zend_extension = xc_llist_get_element_by_zend_extension(&zend_extensions, XCACHE_NAME);
+        if (xc_llist_zend_extension != zend_extensions.head) {
+            zend_error(E_WARNING, "XCache must be loaded as the first zend_extension for maximum compatibility");
+        }
+        /* hide myself */
         xc_llist_unlink(&zend_extensions, xc_llist_zend_extension);