]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Tue, 23 Apr 2013 20:04:00 +0000 (00:04 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 23 Apr 2013 20:04:00 +0000 (00:04 +0400)
* PHP-5.5:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.

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

Simple merge
Simple merge