Changeset 766 for branches/1.3/xcache.c

Show
Ignore:
Timestamp:
04/18/2011 06:29:25 AM (2 years ago)
Author:
moo
Message:

merge changes from trunk

Location:
branches/1.3
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/xcache.c

    r726 r766  
    10011001    /* {{{ restore */ 
    10021002    /* stale precheck */ 
    1003     if (cache->compiling) { 
     1003    if (XG(request_time) - cache->compiling < 30) { 
    10041004        cache->clogs ++; /* is it safe here? */ 
    10051005        return old_compile_file(h, type TSRMLS_CC); 
    … …  
    10101010    ENTER_LOCK_EX(cache) { 
    10111011        /* clogged */ 
    1012         if (cache->compiling) { 
     1012        if (XG(request_time) - cache->compiling < 30) { 
    10131013            cache->clogs ++; 
    10141014            op_array = NULL;