git-svn-id: svn://svn.lighttpd.net/xcache/trunk@86 c26eb9a1-5813-0410-bd6c-c2e55f420ca71.1
parent
bb13290fc1
commit
f24ac86688
14
xcache.c
14
xcache.c
|
@ -629,10 +629,6 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
|
|||
return origin_compile_file(h, type TSRMLS_CC);
|
||||
}
|
||||
|
||||
if (php_check_open_basedir(filename TSRMLS_CC) != 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
stored_xce = NULL;
|
||||
op_array = NULL;
|
||||
ENTER_LOCK(cache) {
|
||||
|
@ -692,6 +688,12 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
|
|||
goto err_oparray;
|
||||
}
|
||||
|
||||
filename = h->opened_path ? h->opened_path : h->filename;
|
||||
if (xce.name.str.val != filename) {
|
||||
xce.name.str.val = filename;
|
||||
xce.name.str.len = strlen(filename);
|
||||
}
|
||||
|
||||
#ifdef HAVE_XCACHE_OPTIMIZER
|
||||
if (XG(optimizer)) {
|
||||
xc_optimize(op_array TSRMLS_CC);
|
||||
|
@ -779,6 +781,10 @@ err_bailout:
|
|||
return op_array;
|
||||
|
||||
restore:
|
||||
if (php_check_open_basedir(stored_xce->name.str.val TSRMLS_CC) != 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
fprintf(stderr, "restoring\n");
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue