]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 26 Nov 2013 17:01:01 +0000 (21:01 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 26 Nov 2013 17:01:01 +0000 (21:01 +0400)
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)

1  2 
ext/opcache/Optimizer/block_pass.c
ext/opcache/Optimizer/zend_optimizer.c

Simple merge