Changeset 886 in svn

Timestamp:

2012-04-05T13:37:21Z (5 years ago)

Author:

Xuefer

Message:

merge some changes from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• processor/processor.m4 (modified) (1 diff)
• processor/string.m4 (modified) (3 diffs)
• xcache-test.ini (modified) (1 diff)
• xcache.h (modified) (2 diffs)

branches/1.3/ChangeLog

@@ +1 @@
+1.3.3 2012-?-?
+========
+ * fix constant name handling (possible SIGSEGV)
+
 1.3.2 2011-06-04
 ========

branches/1.3/NEWS

@@ +1 @@
+1.3.3 2012-?-?
+========
+ * stability fix for PHP_5_3 and before
+
 1.3.2 2011-06-04
 ========

branches/1.3/processor/processor.m4

@@ -241 +241 @@
     DISPATCH(int, flags)
     DISPATCH(uint, name_len)
-    pushdef(`emalloc', `malloc($1)')
-    pushdef(`ecalloc', `calloc($1, $2)')
+    pushdef(`estrndup', `zend_strndup')
     PROC_ZSTRING_N(, name, name_len)
-    popdef(`ecalloc')
-    popdef(`emalloc')
+    popdef(`estrndup')
     DISPATCH(int, module_number)
 ')

branches/1.3/processor/string.m4

@@ -21 +21 @@
             STRTYPE, `zstr_char',  `ZSTR_S($1)',
             `',      `',           `$1'))
-    pushdef(`U', ifelse(
-            PTRTYPE, `char',  `',
-            PTRTYPE, `UChar', `u'))
+    pushdef(`STRDUP', ifelse(
+            PTRTYPE, `char',  `estrndup',
+            PTRTYPE, `UChar', `eustrndup'))
     if (SRCPTR == NULL) {
         IFNOTMEMCPY(`IFCOPY(`
@@ -62 +62 @@
         IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 C_RELAYLINE));')
         IFRESTORE(`
-            DSTPTR = e`'U`'strndup(SRCPTR, ($3) - 1);
+            DSTPTR = STRDUP() (SRCPTR, ($3) - 1);
         ')
         FIXPOINTER_EX(`PTRTYPE', DSTPTR)
@@ -77 +77 @@
         ')
     }
-    popdef(`U')
+    popdef(`STRDUP')
     popdef(`DSTPTR')
     popdef(`SRCPTR')

branches/1.3/xcache-test.ini

@@ -1 +1 @@
 memory_limit = 256M
+error_reporting = E_ALL|E_STRICT
 
 [xcache]

branches/1.3/xcache.h

@@ -4 +4 @@
 #define XCACHE_VERSION    "1.3.3-dev"
 #define XCACHE_AUTHOR     "mOo"
-#define XCACHE_COPYRIGHT  "Copyright (c) 2005-2011"
+#define XCACHE_COPYRIGHT  "Copyright (c) 2005-2012"
 #define XCACHE_URL        "http://xcache.lighttpd.net"
 #define XCACHE_WIKI_URL   XCACHE_URL "/wiki"
@@ -22 +22 @@
 
 #define HAVE_INODE
-#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 99 || PHP_MAJOR_VERSION > 5)
+#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4 || PHP_MAJOR_VERSION > 5)
 #   define ZEND_ENGINE_2_4
 #endif