Changeset 472 for trunk

Show
Ignore:
Timestamp:
08/08/2007 04:10:16 PM (17 months ago)
Author:
moo
Message:

merged [471] from b1.2: live with wrong system time: allow caching files with mtime in further

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,432,447,449,453,465-466,468 to /branches/1.2:1-324,328,334,339,354,358,380,423,428,430,432,447,449,453,465-466,468,471

  • trunk/ChangeLog

    r469 r472  
    66ChangeLog 
    77======== 
     8 * live with wrong system time: allow caching files with mtime in further 
    89 * bug fix for compatibility with Zend Optimizer and other non-cachable 
    910 * new: xcache.stat = On 

  • trunk/xcache.c

    r467 r472  
    776776    xc_entry_data_php_t *php; 
    777777    char *ptr; 
     778    time_t delta; 
    778779 
    779780    if (!filename || !SG(request_info).path_translated) { 
    … …  
    830831 
    831832stat_done: 
    832         if (XG(request_time) - pbuf->st_mtime < 2 && !xc_test) { 
     833        delta = XG(request_time) - pbuf->st_mtime < 2; 
     834        if (abs(delta) < 2 && !xc_test) { 
    833835            return FAILURE; 
    834836        }