Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Fix #66908: php-fpm reload leaks epoll_create() file descriptor
php · Apr 20, 2014 · 6bad228 · 6bad228
2 parents 5addf22 + 49341e9
commit 6bad228
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -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
@@ -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;