]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorJoe Watkins <krakjoe@php.net>
Thu, 19 Oct 2017 10:48:37 +0000 (11:48 +0100)
committerJoe Watkins <krakjoe@php.net>
Thu, 19 Oct 2017 10:48:37 +0000 (11:48 +0100)
* PHP-7.2:
  Fix issue with zend signals in php_request_startup

1  2 
main/main.c

diff --cc main/main.c
Simple merge