Browse Source

PHP_5_4: fix for ZEND_JMP_SET_VAR

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1208 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 9 years ago
parent
commit
d84da590ff
  1. 1
      ChangeLog
  2. 1
      NEWS
  3. 3
      mod_optimizer/xc_optimizer.c
  4. 6
      xcache/xc_utils.c

1
ChangeLog

@ -8,6 +8,7 @@ ChangeLog
* fix random crash when cache is reinitialized yet failed (Thanks to Brad Baker for generating crash dump)
* fix locking impl: improve stability on threaded env (Thanks to Mircea Nicolae for reproducing the bug)
* diagnosis: undefined variable when ini is not found
* fix ZEND_JMP_SET_VAR
3.0.0 2012-10-29
API Changes

1
NEWS

@ -4,6 +4,7 @@ ChangeLog
* bug fixes
* improve compatibility with "the ionCube PHP Loader", Zend Optimizer
* improve stability
* improve support for PHP_5_4
* improve stability on threaded env
3.0.0 2012-10-29

3
mod_optimizer/xc_optimizer.c

@ -183,6 +183,9 @@ static int op_get_flowinfo(op_flowinfo_t *fi, zend_op *opline) /* {{{ */
#ifdef ZEND_JMP_SET
case ZEND_JMP_SET:
#endif
#ifdef ZEND_JMP_SET_VAR
case ZEND_JMP_SET_VAR:
#endif
#ifdef ZEND_JMP_NO_CTOR
case ZEND_JMP_NO_CTOR:
#endif

6
xcache/xc_utils.c

@ -247,6 +247,9 @@ int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
case ZEND_JMPNZ_EX:
#ifdef ZEND_JMP_SET
case ZEND_JMP_SET:
#endif
#ifdef ZEND_JMP_SET_VAR
case ZEND_JMP_SET_VAR:
#endif
assert(Z_OP(opline->op2).opline_num < op_array->last);
Z_OP(opline->op2).jmp_addr = op_array->opcodes + Z_OP(opline->op2).opline_num;
@ -356,6 +359,9 @@ int xc_foreach_early_binding_class(zend_op_array *op_array, xc_foreach_early_bin
case ZEND_JMPNZ_EX:
#ifdef ZEND_JMP_SET
case ZEND_JMP_SET:
#endif
#ifdef ZEND_JMP_SET_VAR
case ZEND_JMP_SET_VAR:
#endif
next = begin + Z_OP(opline->op2).opline_num;
break;

Loading…
Cancel
Save