Ignore:
Timestamp:
2009-07-05T10:01:36+02:00 (6 years ago)
Author:
moo
Message:

merged r498 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 498
  • branches/1.3/processor/processor.m4

    r618 r619  
    504504    dnl readonly_protection=on
    505505    dnl main op_array && have early binding
     506    zend_uint ii;
    506507    if (!processor->readonly_protection && !(src == processor->xce_src->data.php->op_array && processor->xce_src->data.php->have_early_binding)) {
    507508        /* really fast shallow copy */
     
    510511        /* deep */
    511512        STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
     513        STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
     514        xc_gc_add_op_array(dst TSRMLS_CC);
    512515        define(`SKIPASSERT_ONCE')
    513516    }
Note: See TracChangeset for help on using the changeset viewer.