]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 11:48:13 +0000 (15:48 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 11:48:13 +0000 (15:48 +0400)
* PHP-5.5:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

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

Simple merge
Simple merge