Changeset cb7e413 in git


Ignore:
Timestamp:
2013-01-14T14:26:03Z (7 years ago)
Author:
Xuefer <xuefer@…>
Branches:
3.0
Children:
ed41a8c
Parents:
70e847d
Message:

merge from trunk: fixes #297: segv on startup under sparc, ini setting overflow

git-svn-id: svn://svn.lighttpd.net/xcache/branches/3.0@1231 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r70e847d rcb7e413  
     13.0.2 2013-??-??
     2ChangeLog
     3========
     4 * fixes #297: segv on startup under sparc, ini setting overflow
     5
    163.0.1 2013-01-11
    27ChangeLog
  • NEWS

    r70e847d rcb7e413  
     13.0.2 2013-??-??
     2========
     3 * bug fixes
     4
    153.0.1 2013-01-11
    26========
  • xcache.c

    r36ef103 rcb7e413  
    3737/* {{{ globals */
    3838static char *xc_coredump_dir = NULL;
    39 static zend_bool xc_coredump_type = 0;
     39#ifdef ZEND_WIN32
     40static zend_ulong xc_coredump_type = 0;
     41#endif
    4042static zend_bool xc_disable_on_crash = 0;
    4143
     
    721723PHP_INI_BEGIN()
    722724    PHP_INI_ENTRY1     ("xcache.coredump_directory",      "", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_coredump_dir)
     725#ifdef ZEND_WIN32
    723726    PHP_INI_ENTRY1     ("xcache.coredump_type",          "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_coredump_type)
     727#endif
    724728    PHP_INI_ENTRY1_EX  ("xcache.disable_on_crash",       "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_disable_on_crash, zend_ini_boolean_displayer_cb)
    725729    PHP_INI_ENTRY1_EX  ("xcache.test",                   "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_test,             zend_ini_boolean_displayer_cb)
Note: See TracChangeset for help on using the changeset viewer.