Changeset 1231 in svn for branches/3.0


Ignore:
Timestamp:
2013-01-14T15:26:03+01:00 (2 years ago)
Author:
Xuefer
Message:

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

Location:
branches/3.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0

    • Property svn:mergeinfo changed
      /trunkmerged: 1230
  • branches/3.0/ChangeLog

    r1223 r1231  
     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
  • branches/3.0/NEWS

    r1223 r1231  
     13.0.2 2013-??-??
     2========
     3 * bug fixes
     4
    153.0.1 2013-01-11
    26========
  • branches/3.0/xcache.c

    r1201 r1231  
    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.