Changeset 18eb8af in git


Ignore:
Timestamp:
2012-12-12T09:05:12Z (7 years ago)
Author:
Xuefer <xuefer@…>
Branches:
3.0, 3.1, 3.2, master, trunk
Children:
df286b7
Parents:
2b3b0d2
Message:

fixes #295: crash using traits with PHP 5.4.8+

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1196 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r2b3b0d2 r18eb8af  
    22ChangeLog
    33========
    4  * fixs crash when cache is too small on start up
    5  * fixs #290: workaround phpize vs fbsd make bug again
     4 * fixes crash when cache is too small on start up
     5 * fixes #295: crash using traits with PHP 5.4.8+
     6 * fixes #290: workaround phpize vs fbsd make bug again
    67 * improve compatibility with "the ionCube PHP Loader", Zend Optimizer
    78 * fix random crash when cache is reinitialized yet failed (Thanks to Brad Baker for generating crash dump)
  • processor/processor.m4

    ref9f0d6 r18eb8af  
    720720        memcpy(dst, src, sizeof(src[0]));
    721721        dst->refcount[0] = 1000;
     722#ifdef ZEND_ACC_ALIAS
     723        if ((processor->active_class_entry_src && (processor->active_class_entry_src->ce_flags & ZEND_ACC_TRAIT))) {
     724            PROC_ZSTRING(, function_name)
     725        }
     726#endif
    722727        /* deep */
    723728        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
  • xcache_globals.h

    rd74e438 r18eb8af  
    2929
    3030    zend_llist gc_op_arrays;
     31#ifdef ZEND_ACC_ALIAS
     32    zend_llist gc_class_entries;
     33#endif
    3134
    3235#ifdef HAVE_XCACHE_CONSTANT
Note: See TracChangeset for help on using the changeset viewer.