Changeset 408 for branches/1.2/xcache.c

Timestamp:

2007-05-31T06:20:14+02:00 (6 years ago)

Author:

moo

Message:

merged [405] [407] from trunk: fixed #92, full ZendOptimizer? compatibility

Location:

branches/1.2

Files:

• . (modified) (1 prop)
• xcache.c (modified) (8 diffs)

branches/1.2/xcache.c

@@ -98 +98 @@
 
 static zend_bool xc_initized = 0;
+static zend_compile_file_t *origin_compile_file = NULL;
 static zend_compile_file_t *old_compile_file = NULL;
 static zend_llist_element  *xc_llist_zend_extension = NULL;
@@ -838 +839 @@
 }
 /* }}} */
+static zend_op_array *xc_check_initial_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
+{
+    XG(initial_compile_file_called) = 1;
+    return origin_compile_file(h, type TSRMLS_CC);
+}
+/* }}} */
 static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
 {
@@ -941 +948 @@
     old_constinfo_cnt  = zend_hash_num_elements(EG(zend_constants));
 
+    XG(initial_compile_file_called) = 0;
     zend_try {
         op_array = old_compile_file(h, type TSRMLS_CC);
@@ -954 +962 @@
         goto err_oparray;
     }
+
+    if (!XG(initial_compile_file_called)) {
+        xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC);
+        return op_array;
+    }
 
     filename = h->opened_path ? h->opened_path : h->filename;
@@ -1125 +1138 @@
     if (xc_test && stored_xce) {
         /* free it, no install. restore now */
-        xc_sandbox_free(&sandbox, 0 TSRMLS_CC);
+        xc_sandbox_free(&sandbox, XC_NoInstall TSRMLS_CC);
     }
     else if (!op_array) {
         /* failed to compile free it, no install */
-        xc_sandbox_free(&sandbox, 0 TSRMLS_CC);
+        xc_sandbox_free(&sandbox, XC_NoInstall TSRMLS_CC);
     }
     else {
         CG(active_op_array) = op_array;
-        xc_sandbox_free(&sandbox, 1 TSRMLS_CC);
+        xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
     }
 
@@ -1378 +1391 @@
         zend_compile_file = old_compile_file;
         old_compile_file = NULL;
+    }
+
+    if (origin_compile_file) {
+        zend_compile_file = origin_compile_file;
+        origin_compile_file = NULL;
     }
 
@@ -2746 +2764 @@
 #endif
 /* }}} */
-static startup_func_t xc_last_ext_startup = NULL;
+static startup_func_t xc_last_ext_startup;
 static int xc_zend_startup_last(zend_extension *extension) /* {{{ */
 {
@@ -2767 +2785 @@
 {
     xc_zend_extension_gotup = 1;
+
+    if (!origin_compile_file) {
+        origin_compile_file = zend_compile_file;
+        zend_compile_file = xc_check_initial_compile_file;
+    }
+
     if (zend_llist_count(&zend_extensions) > 1) {
         zend_llist_position lpos;