--- embedaddon/lighttpd/src/fdevent_linux_sysepoll.c	2013/10/14 10:32:48	1.1
+++ embedaddon/lighttpd/src/fdevent_linux_sysepoll.c	2016/11/02 10:35:00	1.1.1.3
@@ -1,3 +1,5 @@
+#include "first.h"
+
 #include "fdevent.h"
 #include "buffer.h"
 #include "log.h"
@@ -140,16 +142,10 @@ int fdevent_linux_sysepoll_init(fdevents *ev) {
 		return -1;
 	}
 
-	if (-1 == fcntl(ev->epoll_fd, F_SETFD, FD_CLOEXEC)) {
-		log_error_write(ev->srv, __FILE__, __LINE__, "SSS",
-			"fcntl on epoll-fd failed (", strerror(errno), "), try to set server.event-handler = \"poll\" or \"select\"");
+	fd_close_on_exec(ev->epoll_fd);
 
-		close(ev->epoll_fd);
-
-		return -1;
-	}
-
 	ev->epoll_events = malloc(ev->maxfds * sizeof(*ev->epoll_events));
+	force_assert(NULL != ev->epoll_events);
 
 	return 0;
 }