]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:25:25 +0000 (16:25 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:25:25 +0000 (16:25 -0700)
* PHP-5.6:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor


Trivial merge