Changeset 1106 for trunk


Ignore:
Timestamp:
2012-08-01T18:54:51+02:00 (2 years ago)
Author:
moo
Message:

adds disable_on_crash support for win32

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r1091 r1106  
    99   * adds warning for misconfiguration @ startup 
    1010   * auto disable caching on crash @ runtime 
     11 * cache can be enabled/disabled manually 
    1112 
    12132.0.1 2012-07-14 
  • trunk/xcache-zh-gb2312.ini

    r1026 r1106  
    4949 
    5050 
    51 ; ½öÓÃÓÚ *nix ϵͳ 
    5251; ÉèÖÃΪ¿Õ(½ûÓÃ) »òÕßÀàËÆ "/tmp/phpcore/" 
    5352; ×¢Òâ¸ÃĿ¼Ӧ¸ÃÄܱ» php дÈëÎļþ (¸ú open_basedir ÎÞ¹Ø) 
    5453xcache.coredump_directory =   "" 
     54; disable cache after crash 
     55xcache.disable_on_crash =    Off 
    5556 
    5657; ÆôÓÃʵÑéÐÔ¹¦ÄÜ (Èç¹ûÓÐ) 
  • trunk/xcache.c

    r1067 r1106  
    417417{ 
    418418    HANDLE fileHandle; 
     419    LONG ret = EXCEPTION_CONTINUE_SEARCH; 
    419420 
    420421    SetUnhandledExceptionFilter(oldFilter); 
     
    436437        if (ok) { 
    437438            zend_error(E_ERROR, "Saved dump file to '%s'", crash_dumpPath); 
    438             return EXCEPTION_EXECUTE_HANDLER; 
     439            ret = EXCEPTION_EXECUTE_HANDLER; 
    439440        } 
    440441        else { 
     
    446447    } 
    447448 
    448     return EXCEPTION_CONTINUE_SEARCH; 
     449    if (xc_disable_on_crash) { 
     450        xc_disable_on_crash = 0; 
     451        xc_cacher_disable(); 
     452    } 
     453 
     454    return ret; 
    449455} 
    450456/* }}} */ 
  • trunk/xcache.ini

    r1026 r1106  
    5252; make sure it's writable by php (open_basedir is not checked) 
    5353xcache.coredump_directory =   "" 
    54 ; disable cache after crash until restart. (non-Win32 only) 
     54; disable cache after crash 
    5555xcache.disable_on_crash =    Off 
    5656 
Note: See TracChangeset for help on using the changeset viewer.