]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Tue, 10 Nov 2015 07:11:46 +0000 (10:11 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 10 Nov 2015 07:11:46 +0000 (10:11 +0300)
* PHP-7.0:
  Fixed incorrect order of free/finally on exception

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

Simple merge
Simple merge