adds to open_files whenever old_compile_file is not called

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@957 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

xcache.c

@@ -745,7 +745,7 @@ static void xc_filllist_unlocked(xc_entry_type_t type, xc_cache_t *cache, zval *
 }
 /* }}} */
 
-static zend_op_array *xc_entry_install(xc_entry_php_t *entry_php, zend_file_handle *h TSRMLS_DC) /* {{{ */
+static zend_op_array *xc_entry_install(xc_entry_php_t *entry_php TSRMLS_DC) /* {{{ */
 {
 	zend_uint i;
 	xc_entry_data_php_t *p = entry_php->php;
@@ -817,9 +817,6 @@ static zend_op_array *xc_entry_install(xc_entry_php_t *entry_php, zend_file_hand
 #ifndef ZEND_ENGINE_2_2
 	zend_hash_add(&EG(included_files), entry_php->entry.name.str.val, entry_php->entry.name.str.len+1, (void *)&i, sizeof(int), NULL);
 #endif
-	if (h) {
-		zend_llist_add_element(&CG(open_files), h);
-	}
 
 #ifndef ZEND_ENGINE_2
 	my_free_alloca(new_cest_ptrs, use_heap);
@@ -1844,7 +1841,7 @@ err_op_array:
 	}
 }
 /* }}} */
-static zend_op_array *xc_compile_restore(xc_entry_php_t *stored_entry, xc_entry_data_php_t *stored_php, zend_file_handle *h TSRMLS_DC) /* {{{ */
+static zend_op_array *xc_compile_restore(xc_entry_php_t *stored_entry, xc_entry_data_php_t *stored_php TSRMLS_DC) /* {{{ */
 {
 	zend_op_array *op_array;
 	xc_entry_php_t restored_entry;
@@ -1864,7 +1861,7 @@ static zend_op_array *xc_compile_restore(xc_entry_php_t *stored_entry, xc_entry_
 
 	catched = 0;
 	zend_try {
-		op_array = xc_entry_install(&restored_entry, h TSRMLS_CC);
+		op_array = xc_entry_install(&restored_entry TSRMLS_CC);
 	} zend_catch {
 		catched = 1;
 	} zend_end_try();
@@ -1977,6 +1974,9 @@ static zend_op_array *xc_compile_file_sandboxed(void *data TSRMLS_DC) /* {{{ */
 	xc_free_php(&compiler->new_php TSRMLS_CC);
 
 	if (stored_entry) {
+		sandboxed_compiler->stored_entry = stored_entry;
+		sandboxed_compiler->stored_php = stored_php;
+		/* discard newly compiled result, restore from stored one */
 		if (compiler->new_php.op_array) {
 #ifdef ZEND_ENGINE_2
 			destroy_op_array(compiler->new_php.op_array TSRMLS_CC);
@@ -1985,15 +1985,10 @@ static zend_op_array *xc_compile_file_sandboxed(void *data TSRMLS_DC) /* {{{ */
 #endif
 			efree(compiler->new_php.op_array);
 			compiler->new_php.op_array = NULL;
-			sandboxed_compiler->h = NULL;
 		}
-		sandboxed_compiler->stored_entry = stored_entry;
-		sandboxed_compiler->stored_php = stored_php;
-		/* sandbox no install */
 		return NULL;
 	}
 	else {
-		/* install it with sandbox */
 		return compiler->new_php.op_array;
 	}
 
@@ -2122,7 +2117,8 @@ static zend_op_array *xc_compile_file_cached(xc_compiler_t *compiler, zend_file_
 
 	/* found entry */
 	if (stored_entry && stored_php) {
-		return xc_compile_restore(stored_entry, stored_php, NULL /* h */ TSRMLS_CC);
+		zend_llist_add_element(&CG(open_files), h);
+		return xc_compile_restore(stored_entry, stored_php TSRMLS_CC);
 	}
 
 	/* gaveup */
@@ -2138,7 +2134,7 @@ static zend_op_array *xc_compile_file_cached(xc_compiler_t *compiler, zend_file_
 	sandboxed_compiler.stored_entry = NULL;
 	op_array = xc_sandbox(xc_compile_file_sandboxed, (void *) &sandboxed_compiler, h->opened_path ? h->opened_path : h->filename TSRMLS_CC);
 	if (sandboxed_compiler.stored_entry) {
-		return xc_compile_restore(sandboxed_compiler.stored_entry, sandboxed_compiler.stored_php, sandboxed_compiler.h TSRMLS_CC);
+		return xc_compile_restore(sandboxed_compiler.stored_entry, sandboxed_compiler.stored_php TSRMLS_CC);
 	}
 	else {
 		return op_array;
@@ -2165,9 +2161,8 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
 	 || strstr(PG(include_path), "://") != NULL
 #endif
 	 ) {
-		op_array = old_compile_file(h, type TSRMLS_CC);
 		TRACE("%s", "cacher not enabled");
-		return op_array;
+		return old_compile_file(h, type TSRMLS_CC);
 	}
 
 	/* {{{ entry_init_key */