Changeset 1231 in svn

Timestamp:

2013-01-14T14:26:03Z (7 years ago)

Author:

Xuefer

Message:

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

Location:

branches/3.0

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• xcache.c (modified) (2 diffs)

branches/3.0/ChangeLog

@@ +1 @@
+3.0.2 2013-??-??
+ChangeLog
+========
+ * fixes #297: segv on startup under sparc, ini setting overflow
+
 3.0.1 2013-01-11
 ChangeLog

branches/3.0/NEWS

@@ +1 @@
+3.0.2 2013-??-??
+========
+ * bug fixes
+
 3.0.1 2013-01-11
 ========

branches/3.0/xcache.c

@@ -37 +37 @@
 /* {{{ globals */
 static char *xc_coredump_dir = NULL;
-static zend_bool xc_coredump_type = 0;
+#ifdef ZEND_WIN32
+static zend_ulong xc_coredump_type = 0;
+#endif
 static zend_bool xc_disable_on_crash = 0;
 
@@ -721 +723 @@
 PHP_INI_BEGIN()
     PHP_INI_ENTRY1     ("xcache.coredump_directory",      "", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_coredump_dir)
+#ifdef ZEND_WIN32
     PHP_INI_ENTRY1     ("xcache.coredump_type",          "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_coredump_type)
+#endif
     PHP_INI_ENTRY1_EX  ("xcache.disable_on_crash",       "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_disable_on_crash, zend_ini_boolean_displayer_cb)
     PHP_INI_ENTRY1_EX  ("xcache.test",                   "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_test,             zend_ini_boolean_displayer_cb)