Browse Source

fix wrong merge in [996] and [451], [454]

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@455 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 15 years ago
parent
commit
71adde3e60
  1. 8
      xcache.c

8
xcache.c

@ -993,12 +993,6 @@ 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;
/* it's not cachable, but don't scare the users with high misses */
cache->misses --;
} LEAVE_LOCK(cache);
return op_array;
}
@ -1313,6 +1307,8 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
/* not cachable */
if (!php.op_array) {
cache->compiling = 0;
/* it's not cachable, but don't scare the users with high misses */
cache->misses --;
xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC);
return op_array;
}

Loading…
Cancel
Save