From: Stanislav Malyshev <stas@php.net>
Date: Sun, 20 Apr 2014 23:24:15 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~358^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0df431482fba37a3dac433d52cf339f55e81f817;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

0df431482fba37a3dac433d52cf339f55e81f817
diff --cc NEWS
index e0503fb3ef,660ea4e21a..a1427512c2
--- a/NEWS
+++ b/NEWS
@@@ -40,6 -48,6 +40,8 @@@ PH
  
  - FPM:
    . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
++  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
++    (Julio Pintos)
  
  - JSON:
    . Fixed bug #66021 (Blank line inside empty array/object when