Changeset 1208

Show
Ignore:
Timestamp:
12/18/2012 08:14:03 AM (5 months ago)
Author:
moo
Message:

PHP_5_4: fix for ZEND_JMP_SET_VAR

Location:
trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r1205 r1208  
    99 * fix locking impl: improve stability on threaded env (Thanks to Mircea Nicolae for reproducing the bug) 
    1010 * diagnosis: undefined variable when ini is not found 
     11 * fix ZEND_JMP_SET_VAR 
    1112 
    12133.0.0 2012-10-29 

  • trunk/NEWS

    r1205 r1208  
    55 * improve compatibility with "the ionCube PHP Loader", Zend Optimizer 
    66 * improve stability 
     7 * improve support for PHP_5_4 
    78 * improve stability on threaded env 
    89 

  • trunk/mod_optimizer/xc_optimizer.c

    r1151 r1208  
    183183#ifdef ZEND_JMP_SET 
    184184    case ZEND_JMP_SET: 
     185#endif 
     186#ifdef ZEND_JMP_SET_VAR 
     187    case ZEND_JMP_SET_VAR: 
    185188#endif 
    186189#ifdef ZEND_JMP_NO_CTOR 

  • trunk/xcache/xc_utils.c

    r1171 r1208  
    248248#ifdef ZEND_JMP_SET 
    249249            case ZEND_JMP_SET: 
     250#endif 
     251#ifdef ZEND_JMP_SET_VAR 
     252            case ZEND_JMP_SET_VAR: 
    250253#endif 
    251254                assert(Z_OP(opline->op2).opline_num < op_array->last); 
    … …  
    357360#ifdef ZEND_JMP_SET 
    358361            case ZEND_JMP_SET: 
     362#endif 
     363#ifdef ZEND_JMP_SET_VAR 
     364            case ZEND_JMP_SET_VAR: 
    359365#endif 
    360366                next = begin + Z_OP(opline->op2).opline_num;