Changeset 1a6bf59 in git


Ignore:
Timestamp:
2012-08-01T17:02:46Z (7 years ago)
Author:
Xuefer <xuefer@…>
Children:
15f51ed
Parents:
dbae5e1 (diff), 2782394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

retagged 3.0.0-rc1

git-svn-id: svn://svn.lighttpd.net/xcache/tags/3.0.0-beta1@1110 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • NEWS

    r4156d8d r711cc26  
    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
  • config.w32

    r79aa9f1 r2782394  
    3232xc_utils.c \
    3333", "xcache");
    34     ADD_SOURCES(configure_module_dirname + "/xcache", " \
     34    ADD_SOURCES(configure_module_dirname + "/mod_cacher", " \
    3535xc_cacher.c \
    3636", "xcache");
  • xcache-zh-gb2312.ini

    r4064549 r711cc26  
    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; ÆôÓÃʵÑéÐÔ¹¦ÄÜ (Èç¹ûÓÐ)
  • xcache.c

    r5814a70 r711cc26  
    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/* }}} */
  • xcache.ini

    r4064549 r711cc26  
    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.