]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.4'
authorXinchen Hui <laruence@gmail.com>
Fri, 15 May 2020 07:40:43 +0000 (15:40 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 15 May 2020 07:40:43 +0000 (15:40 +0800)
commit0ece5638a4f973a5b23fa0315496c02c9ec4a8de
treeba5080cf1857e78af9c858e6ca2c968b0aac222c
parent4631b4e8135f443e7d5e6238c2a3a2b504677da8
parent446d189aa00dcca5eb66a78a26bb92cf8d919343
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #97599 (coredump in set_error_handler)

Conflicts:
Zend/zend.c
Zend/tests/bug79599.phpt