]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Wed, 23 Jul 2014 18:49:46 +0000 (22:49 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 23 Jul 2014 18:49:46 +0000 (22:49 +0400)
* PHP-5.6:
  Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge