Changeset 1533 in svn

Timestamp:

2014-09-12T05:05:43Z (3 years ago)

Author:

Xuefer

Message:

closes #337: adds warning about Zend OPcache optimization level incompatiblity

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mod_cacher/xc_cacher.c (modified) (1 diff)

trunk/ChangeLog

@@ -11 +11 @@
    * (WIP) cache to disk
    * added class const support for __FILE__ __DIR__
+   * closes #337: adds warning about Zend OPcache optimization level incompatiblity
  * disassembler, decompiler:
    * PHP_5_6 support

trunk/NEWS

@@ -4 +4 @@
  * cache defragment, cache to disk
  * added class const support for __FILE__ __DIR__
+ * aware of Zend OPcache
  * updated disassembler decompiler support
 

trunk/mod_cacher/xc_cacher.c

@@ -3882 +3882 @@
     ext = zend_get_extension("Zend Optimizer");
     if (ext) {
-        /* zend_optimizer.optimization_level>0 is not compatible with other cacher, disabling */
+        char *value;
+        if (cfg_get_string("zend_optimizer.optimization_level", &value) == SUCCESS && zend_atol(value, strlen(value)) > 0) {
+            zend_error(E_NOTICE, "Zend Optimizer with zend_optimizer.optimization_level>0 is not compatible with other cacher, disabling");
+        }
         ext->op_array_handler = NULL;
     }
+
+    ext = zend_get_extension("Zend OPcache");
+    if (ext) {
+        char *value;
+        if (cfg_get_string("opcache.optimization_level", &value) == SUCCESS && zend_atol(value, strlen(value)) > 0) {
+            zend_error(E_WARNING, "Constant folding feature in Zend OPcache is not compatible with XCache's __DIR__ handling, please set opcache.optimization_level=0 or disable Zend OPcache");
+        }
+    }
+
     /* cache if there's an op_array_ctor */
     for (ext = zend_llist_get_first_ex(&zend_extensions, &lpos);