Browse Source

update op_array->filename for hard link restoring

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@687 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 12 years ago
parent
commit
f1143e68cb
  1. 5
      processor/processor.m4
  2. 5
      xcache.c

5
processor/processor.m4

@ -362,7 +362,7 @@ DEF_STRUCT_P_FUNC(`zend_class_entry', , `dnl {{{
')
DISPATCH(zend_uint, num_interfaces)
IFRESTORE(`COPY(filename)', `PROC_STRING(filename)')
IFRESTORE(`dst->filename = processor->entry_src->filepath;DONE(filename)', `PROC_STRING(filename)')
DISPATCH(zend_uint, line_start)
DISPATCH(zend_uint, line_end)
#ifdef ZEND_ENGINE_2_1
@ -521,6 +521,7 @@ DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
STRUCT_ARRAY(num_args, zend_arg_info, arg_info)
gc_arg_info = 1;
#endif
IFRESTORE(`dst->filename = processor->entry_src->filepath;')
if (op_array_info->oplineinfo_cnt) {
gc_opcodes = 1;
COPY_N_EX(last, zend_op, opcodes)
@ -639,7 +640,7 @@ DEF_STRUCT_P_FUNC(`zend_op_array', , `dnl {{{
DISPATCH(zend_bool, uses_this)
#endif
IFRESTORE(`COPY(filename)', `PROC_STRING(filename)')
IFRESTORE(`dst->filename = processor->entry_src->filepath;DONE(filename)', `PROC_STRING(filename)')
#ifdef IS_UNICODE
IFRESTORE(`
COPY(script_encoding)

5
xcache.c

@ -1577,10 +1577,7 @@ static zend_op_array *xc_compile_php(xc_entry_t *xce, xc_entry_data_php_t *php,
xce->var##path = NULL; \
xce->var##path_len = 0; \
}
if (!const_usage.filepath_used) {
xce->filepath = NULL;
xce->filepath_len = 0;
}
/* filepath is required to restore op_array->filename, so no free filepath here */
X_FREE_UNUSED(dir)
#ifdef IS_UNICODE
X_FREE_UNUSED(ufile)

Loading…
Cancel
Save