Changeset 433

Show
Ignore:
Timestamp:
06/29/2007 03:09:47 AM (16 months ago)
Author:
moo
Message:

merged [431] from b1.2: fast inc/dec was trying to break ro protection

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svnmerge-integrated changed from /branches/1.2:1-324,328,334,339,354,358,380,423,428,430 to /branches/1.2:1-324,328,334,339,354,358,380,423,428,430,432

  • trunk/ChangeLog

    r425 r433  
    1010 * wrong http auth realm 
    1111 * #86: remove/edit variable in admin page 
     12 * fixed #109: fast inc/dec was trying to break ro protection 
    1213 * fixed #101, #105: Fixed compatibility issue for apache 1.x 
    1314 * fixed #94: Garbage collector disabled when xcache.cacher set to off 

  • trunk/xcache.c

    r429 r433  
    21862186                stored_var = stored_xce->data.var; 
    21872187                if (Z_TYPE_P(stored_var->value) == IS_LONG) { 
     2188                    zval *zv; 
    21882189                    stored_xce->ctime = XG(request_time); 
    21892190                    stored_xce->ttl   = xce.ttl; 
    … …  
    21922193                    value += (inc == 1 ? count : - count); 
    21932194                    RETVAL_LONG(value); 
    2194                     Z_LVAL_P(stored_var->value) = value; 
     2195 
     2196                    zv = (zval *) xce.cache->shm->handlers->to_readwrite(xce.cache->shm, (char *) stored_var->value); 
     2197                    Z_LVAL_P(zv) = value; 
    21952198                    break; /* leave lock */ 
    21962199                }