Changeset 1178 for trunk/xcache/xc_sandbox.c

Timestamp:

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

Author:

moo

Message:

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

File:

• trunk/xcache/xc_sandbox.c (modified) (2 diffs)

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