diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/fpm/fpm/events/epoll.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -14,6 +14,10 @@ PHP NEWS . Fixed bug #67081 (DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset). (Anatol) +- FPM: + . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor). + (Julio Pintos) + ?? ??? 2014, PHP 5.5.12 - Core: . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike) diff --git a/sapi/fpm/fpm/events/epoll.c b/sapi/fpm/fpm/events/epoll.c index 2857ea2a09..b55cb44b15 100644 --- a/sapi/fpm/fpm/events/epoll.c +++ b/sapi/fpm/fpm/events/epoll.c @@ -46,7 +46,7 @@ static struct fpm_event_module_s epoll_module = { static struct epoll_event *epollfds = NULL; static int nepollfds = 0; -static int epollfd = 0; +static int epollfd = -1; #endif /* HAVE_EPOLL */ @@ -103,6 +103,10 @@ static int fpm_event_epoll_clean() /* {{{ */ free(epollfds); epollfds = NULL; } + if (epollfd != -1) { + close(epollfd); + epollfd = -1; + } nepollfds = 0; |