]> granicus.if.org Git - php/commitdiff
Merge branch 'patch-1' of https://github.com/mickael9/php-src
authorXinchen Hui <laruence@gmail.com>
Mon, 15 Feb 2016 05:23:01 +0000 (13:23 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 15 Feb 2016 05:23:01 +0000 (13:23 +0800)
* 'patch-1' of https://github.com/mickael9/php-src:
  fpm: call zend_signal_init() in child


Trivial merge