]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:24:15 +0000 (16:24 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:25:03 +0000 (16:25 -0700)
commit0df431482fba37a3dac433d52cf339f55e81f817
tree9803ddadd14176cd3df9379a3c8fe5bb0fc33edb
parent774f16318b3739e751d5a041f3601a3cf3000614
parent6bad228b4e0c2429bc2f62f447b56ac54c2f5b04
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
NEWS