Changeset 1178

Timestamp:

2012-11-13T16:16:02+01:00 (6 months ago)

Author:

moo

Message:

improve compatibility with "the ionCube PHP Loader", Zend Optimizer. dont do early binding for cached opcode

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mod_cacher/xc_cacher.c (modified) (1 diff)
• xcache/xc_sandbox.c (modified) (2 diffs)
• xcache_globals.h (modified) (1 diff)

trunk/ChangeLog

@@ -3 +3 @@
 ========
  * fixed #290: workaround phpize vs fbsd make bug again
- * improve compatibility with "the ionCube PHP Loader", but still broken
+ * improve compatibility with "the ionCube PHP Loader", Zend Optimizer
 
 3.0.0 2012-10-29

trunk/NEWS

@@ -3 +3 @@
 ========
  * bug fixes
+ * improve compatibility with "the ionCube PHP Loader", Zend Optimizer
 
 3.0.0 2012-10-29

trunk/mod_cacher/xc_cacher.c

@@ -1946 +1946 @@
     memset(&compiler->new_php.op_array_info, 0, sizeof(compiler->new_php.op_array_info));
 
-    XG(initial_compile_file_called) = 0;
     zend_try {
         compiler->new_php.op_array = NULL;

trunk/xcache/xc_sandbox.c

@@ -230 +230 @@
 
     XG(sandbox) = (void *) sandbox;
+    XG(initial_compile_file_called) = 0;
     return sandbox;
 }
@@ -291 +292 @@
 #endif
 
+    /* CG(compiler_options) applies only if initial_compile_file_called */
+    if (XG(initial_compile_file_called)) {
 #ifdef ZEND_COMPILE_DELAYED_BINDING
-    zend_do_delayed_early_binding(CG(active_op_array) TSRMLS_CC);
+        zend_do_delayed_early_binding(CG(active_op_array) TSRMLS_CC);
 #else
-    xc_undo_pass_two(CG(active_op_array) TSRMLS_CC);
-    xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC);
-    xc_redo_pass_two(CG(active_op_array) TSRMLS_CC);
-#endif
+        xc_undo_pass_two(CG(active_op_array) TSRMLS_CC);
+        xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC);
+        xc_redo_pass_two(CG(active_op_array) TSRMLS_CC);
+#endif
+    }
 
 #ifdef XCACHE_ERROR_CACHING

trunk/xcache_globals.h

@@ -2 +2 @@
 
 ZEND_BEGIN_MODULE_GLOBALS(xcache)
-    zend_bool initial_compile_file_called; /* true is origin_compile_file is called */
+    zend_bool initial_compile_file_called; /* true if origin_compile_file is called */
     zend_bool cacher;      /* true if enabled */
     zend_bool stat;