]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Thu, 7 May 2015 09:16:40 +0000 (12:16 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 7 May 2015 09:16:40 +0000 (12:16 +0300)
* PHP-5.5:
  Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

Conflicts:
NEWS

1  2 
ext/opcache/Optimizer/block_pass.c

Simple merge