]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2020 11:56:18 +0000 (14:56 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 17 Apr 2020 11:56:18 +0000 (14:56 +0300)
* PHP-7.4:
  zend_timeout() may access EX(opline)

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

Simple merge
Simple merge