From 4953a17ea396c53661089f92673db451e116f392 Mon Sep 17 00:00:00 2001 From: Xuefer Date: Thu, 12 Jul 2007 03:11:06 +0000 Subject: [PATCH] merged [449] from turnk: fix compiling state after compiling non cachable files, thanks PatrickDK git-svn-id: svn://svn.lighttpd.net/xcache/trunk@451 c26eb9a1-5813-0410-bd6c-c2e55f420ca7 --- ChangeLog | 1 + NEWS | 1 + xcache.c | 3 +++ 3 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index e3ed4e4..c49a99b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Ini Settings Changes ChangeLog ======== + * bug fix for compatibility with Zend Optimizer and other non-cachable * #55: segv php tokenizer on certain special situation * new: xcache.stat = On * could not show module info in admin page when XCache is the last module diff --git a/NEWS b/NEWS index 40962d3..2480584 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 2.0.0 2007-?-? ======== + * bug fix for compatibility with Zend Optimizer and other non-cachable * a rare segv bug with token_get_all * compatibility fix for apache 1.x, which init XCache module correctly * full Zend Optimizer compatibility diff --git a/xcache.c b/xcache.c index 9039df2..97f4d28 100644 --- a/xcache.c +++ b/xcache.c @@ -994,6 +994,9 @@ static zend_op_array *xc_compile_php(xc_entry_data_php_t *php, zend_file_handle if (!XG(initial_compile_file_called)) { xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC); + ENTER_LOCK(cache) { + cache->compiling = 0; + } LEAVE_LOCK(cache); return op_array; }