Changeset 886 in svn


Ignore:
Timestamp:
2012-04-05T13:37:21Z (3 years ago)
Author:
Xuefer
Message:

merge some changes from trunk

Location:
branches/1.3
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/ChangeLog

    r817 r886  
     11.3.3 2012-?-?
     2========
     3 * fix constant name handling (possible SIGSEGV)
     4
    151.3.2 2011-06-04
    26========
  • branches/1.3/NEWS

    r814 r886  
     11.3.3 2012-?-?
     2========
     3 * stability fix for PHP_5_3 and before
     4
    151.3.2 2011-06-04
    26========
  • branches/1.3/processor/processor.m4

    r739 r886  
    241241    DISPATCH(int, flags)
    242242    DISPATCH(uint, name_len)
    243     pushdef(`emalloc', `malloc($1)')
    244     pushdef(`ecalloc', `calloc($1, $2)')
     243    pushdef(`estrndup', `zend_strndup')
    245244    PROC_ZSTRING_N(, name, name_len)
    246     popdef(`ecalloc')
    247     popdef(`emalloc')
     245    popdef(`estrndup')
    248246    DISPATCH(int, module_number)
    249247')
  • branches/1.3/processor/string.m4

    r691 r886  
    2121            STRTYPE, `zstr_char',  `ZSTR_S($1)',
    2222            `',      `',           `$1'))
    23     pushdef(`U', ifelse(
    24             PTRTYPE, `char',  `',
    25             PTRTYPE, `UChar', `u'))
     23    pushdef(`STRDUP', ifelse(
     24            PTRTYPE, `char',  `estrndup',
     25            PTRTYPE, `UChar', `eustrndup'))
    2626    if (SRCPTR == NULL) {
    2727        IFNOTMEMCPY(`IFCOPY(`
     
    6262        IFSTORE(`DSTPTR = ifelse(PTRTYPE,`char',`ZSTR_S',`ZSTR_U')(xc_store_string_n(processor, ISTYPE, ZSTR(SRCSTR), $3 C_RELAYLINE));')
    6363        IFRESTORE(`
    64             DSTPTR = e`'U`'strndup(SRCPTR, ($3) - 1);
     64            DSTPTR = STRDUP() (SRCPTR, ($3) - 1);
    6565        ')
    6666        FIXPOINTER_EX(`PTRTYPE', DSTPTR)
     
    7777        ')
    7878    }
    79     popdef(`U')
     79    popdef(`STRDUP')
    8080    popdef(`DSTPTR')
    8181    popdef(`SRCPTR')
  • branches/1.3/xcache-test.ini

    r627 r886  
    11memory_limit = 256M
     2error_reporting = E_ALL|E_STRICT
    23
    34[xcache]
  • branches/1.3/xcache.h

    r816 r886  
    44#define XCACHE_VERSION    "1.3.3-dev"
    55#define XCACHE_AUTHOR     "mOo"
    6 #define XCACHE_COPYRIGHT  "Copyright (c) 2005-2011"
     6#define XCACHE_COPYRIGHT  "Copyright (c) 2005-2012"
    77#define XCACHE_URL        "http://xcache.lighttpd.net"
    88#define XCACHE_WIKI_URL   XCACHE_URL "/wiki"
     
    2222
    2323#define HAVE_INODE
    24 #if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 99 || PHP_MAJOR_VERSION > 5)
     24#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4 || PHP_MAJOR_VERSION > 5)
    2525#   define ZEND_ENGINE_2_4
    2626#endif
Note: See TracChangeset for help on using the changeset viewer.