Changeset 278

Show
Ignore:
Timestamp:
10/19/06 15:11:35 (2 years ago)
Author:
hans
Message:

Replaced short php opening tags in control.php, Fixed typo in NEWS file, Fix for ticket #170 (handling of multi-dim globals by the optimizer)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/ChangeLog

    r277 r278  
     12006-10-19  Hans Rakers <hans at parse dot nl> 
     2 
     3        * Replaced short php opening tags in control.php 
     4        * Fixed typo in NEWS file 
     5        * Fix for ticket #170 (handling of multi-dim globals by the optimizer) 
     6 
    172006-10-10  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
    28 

  • eaccelerator/trunk/NEWS

    r277 r278  
    22---------------------------------- 
    33 
    4  * Released 0.9.6 
     4 * Released 0.9.5 
    55 
    66    Changes in this version (from 0.9.4): 

  • eaccelerator/trunk/control.php

    r265 r278  
    116116    <table> 
    117117        <tr> 
    118             <th><a href="<?=$_SERVER['PHP_SELF']?>?sort=file&order=<?=($order == "asc" ? "desc" : "asc")?>">Filename</a>&nbsp;<? if($sortby == "file") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
    119             <th><a href="<?=$_SERVER['PHP_SELF']?>?sort=mtime&order=<?=($order == "asc" ? "desc" : "asc")?>">MTime</a>&nbsp;<? if($sortby == "mtime") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
    120             <th><a href="<?=$_SERVER['PHP_SELF']?>?sort=size&order=<?=($order == "asc" ? "desc" : "asc")?>">Size</a>&nbsp;<? if($sortby == "size") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
    121             <th><a href="<?=$_SERVER['PHP_SELF']?>?sort=reloads&order=<?=($order == "asc" ? "desc" : "asc")?>">Reloads</a>&nbsp;<? if($sortby == "reloads") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
    122             <th><a href="<?=$_SERVER['PHP_SELF']?>?sort=hits&order=<?=($order == "asc" ? "desc" : "asc")?>">Hits</a>&nbsp;<? if($sortby == "hits") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
     118            <th><a href="<?php echo $_SERVER['PHP_SELF']?>?sort=file&order=<?php echo($order == "asc" ? "desc" : "asc")?>">Filename</a>&nbsp;<?php if($sortby == "file") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
     119            <th><a href="<?php echo $_SERVER['PHP_SELF']?>?sort=mtime&order=<?php echo ($order == "asc" ? "desc" : "asc")?>">MTime</a>&nbsp;<?php if($sortby == "mtime") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
     120            <th><a href="<?php echo $_SERVER['PHP_SELF']?>?sort=size&order=<?php echo ($order == "asc" ? "desc" : "asc")?>">Size</a>&nbsp;<?php if($sortby == "size") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
     121            <th><a href="<?php echo $_SERVER['PHP_SELF']?>?sort=reloads&order=<?php echo ($order == "asc" ? "desc" : "asc")?>">Reloads</a>&nbsp;<?php if($sortby == "reloads") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
     122            <th><a href="<?php echo $_SERVER['PHP_SELF']?>?sort=hits&order=<?php echo ($order == "asc" ? "desc" : "asc")?>">Hits</a>&nbsp;<?php if($sortby == "hits") echo ($order == "asc" ? "&darr;" : "&uarr;")?></th> 
    123123        </tr> 
    124124    <?php 

  • eaccelerator/trunk/optimize.c

    r266 r278  
    21192119                DEFINED_OP(op->op1)->op1.u.constant.value.str.len == (sizeof("GLOBALS")-1) && 
    21202120                memcmp(DEFINED_OP(op->op1)->op1.u.constant.value.str.val, "GLOBALS", sizeof("GLOBALS")-1) == 0) { 
    2121       zend_op *x = DEFINED_OP(op->op1); 
    2122       SET_UNDEFINED(op->op1); 
    2123       STR_FREE(x->op1.u.constant.value.str.val); 
    2124       FETCH_TYPE(x) = ZEND_FETCH_GLOBAL; 
    2125       memcpy(&x->op1,&op->op2,sizeof(znode)); 
    2126       memcpy(&x->result,&op->result,sizeof(znode)); 
    2127       SET_DEFINED(x); 
    2128       SET_TO_NOP(op); 
     2121      zend_op *x = op+1; 
     2122      if (x->opcode != op->opcode) { 
     2123        x = DEFINED_OP(op->op1); 
     2124        SET_UNDEFINED(op->op1); 
     2125        STR_FREE(x->op1.u.constant.value.str.val); 
     2126        FETCH_TYPE(x) = ZEND_FETCH_GLOBAL; 
     2127        memcpy(&x->op1,&op->op2,sizeof(znode)); 
     2128        memcpy(&x->result,&op->result,sizeof(znode)); 
     2129        SET_DEFINED(x); 
     2130        SET_TO_NOP(op); 
    21292131#ifndef ZEND_ENGINE_2 
    2130       if (x->op1.op_type == IS_VAR) { 
    2131         memcpy(&op->op1,&x->op1,sizeof(znode)); 
    2132         op->opcode = ZEND_SWITCH_FREE; 
    2133         op->extended_value = 0; 
    2134       } 
    2135 #endif 
     2132        if (x->op1.op_type == IS_VAR) { 
     2133          memcpy(&op->op1,&x->op1,sizeof(znode)); 
     2134          op->opcode = ZEND_SWITCH_FREE; 
     2135          op->extended_value = 0; 
     2136        } 
     2137#endif 
     2138      } 
    21362139#ifdef ZEND_ENGINE_2 
    21372140    /* FETCH_IS               local("GLOBALS"),$x    ISSET_ISEMPTY_VAR $y(global),res