Changeset 455

Show
Ignore:
Timestamp:
07/14/2007 04:47:24 AM (17 months ago)
Author:
moo
Message:

fix wrong merge in [996] and [451], [454]

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/xcache.c

    r454 r455  
    994994 
    995995    if (!XG(initial_compile_file_called)) { 
    996         xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC); 
    997         ENTER_LOCK(cache) { 
    998             cache->compiling = 0; 
    999             /* it's not cachable, but don't scare the users with high misses */ 
    1000             cache->misses --; 
    1001         } LEAVE_LOCK(cache); 
    1002996        return op_array; 
    1003997    } 
    … …  
    13141308        if (!php.op_array) { 
    13151309            cache->compiling = 0; 
     1310            /* it's not cachable, but don't scare the users with high misses */ 
     1311            cache->misses --; 
    13161312            xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC); 
    13171313            return op_array;