Changeset 1196 for trunk


Ignore:
Timestamp:
2012-12-12T10:05:12+01:00 (23 months ago)
Author:
moo
Message:

fixes #295: crash using traits with PHP 5.4.8+

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r1195 r1196  
    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) 
  • trunk/processor/processor.m4

    r1051 r1196  
    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) 
  • trunk/xcache_globals.h

    r1178 r1196  
    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.