Changeset 417 for branches/1.2/xcache.c

Show
Ignore:
Timestamp:
06/17/2007 04:13:42 AM (18 months ago)
Author:
moo
Message:

merged [416] from trunk->1.2: Garbage collector disabled when xcache.cacher set to off

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-405,407,410,412 to /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-405,407,410,416
    • Property svnsvnmerge-integrated set to /trunk:1-302,344-346,371,374-375,388,391,393,395,400,402-405,407,410,412,416

  • branches/1.2/xcache.c

    r408 r417  
    14881488    } 
    14891489 
    1490     if (XG(cacher)) { 
    14911490#if PHP_API_VERSION <= 20041225 
    1492         XG(request_time) = time(NULL); 
     1491    XG(request_time) = time(NULL); 
    14931492#else 
    1494         XG(request_time) = sapi_get_request_time(TSRMLS_C); 
    1495 #endif 
    1496     } 
     1493    XG(request_time) = sapi_get_request_time(TSRMLS_C); 
     1494#endif 
     1495 
    14971496#ifdef HAVE_XCACHE_COVERAGER 
    14981497    xc_coverager_request_init(TSRMLS_C);