Changeset 133

Show
Ignore:
Timestamp:
11/17/05 21:25:11 (3 years ago)
Author:
zoeloelip
Message:

Fixed optimizer bug with php 5.0.5

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/ChangeLog

    r132 r133  
     12005-11-17 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
     2 
     3        * Fixed optimizer bug with php 5.0.5 
     4 
    152005-11-16 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    26 

  • eaccelerator/trunk/optimize.c

    r128 r133  
    16971697      } 
    16981698    } 
     1699#if 0  
     1700    /* doesn't work with newer php versions */ 
    16991701    if (op->opcode == ZEND_FETCH_CONSTANT && 
    17001702        op->result.op_type == IS_TMP_VAR) { 
    17011703      zend_constant *c = NULL; 
    1702       if (op->op1.u.constant.value.str.val != NULL && 
     1704      if (op->op1.u.constant.value.str.val != NULL &&  
    17031705          opt_get_constant(op->op1.u.constant.value.str.val, op->op1.u.constant.value.str.len, &c TSRMLS_CC)  
    17041706          && c != NULL && ((c->flags & CONST_PERSISTENT) != 0)) { 
    …… 
    17111713        op->op2.op_type = IS_UNUSED; 
    17121714      } 
    1713     } else if ((op->opcode == ZEND_ADD || 
     1715    } else  
     1716#endif 
     1717    if ((op->opcode == ZEND_ADD || 
    17141718                op->opcode == ZEND_SUB || 
    17151719                op->opcode == ZEND_MUL ||