repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 66e68de16a2c174811cf161654b734a9254456c5:
path_to: 
revision_to: 

commit 66e68de16a2c174811cf161654b734a9254456c5
Author: Florian Westphal 
Date:   Thu Apr 3 14:17:42 2008 +0000

    io.c: fix select FD_SETSIZE check when using epoll as io backend

diff --git a/src/ngircd/io.c b/src/ngircd/io.c

--- a/src/ngircd/io.c
+++ b/src/ngircd/io.c
@@ -12,7 +12,7 @@

 #include "portab.h"

-static char UNUSED id[] = "$Id: io.c,v 1.29 2008/03/27 15:47:21 fw Exp $";
+static char UNUSED id[] = "$Id: io.c,v 1.30 2008/04/03 14:17:42 fw Exp $";

 #include 
 #include 
@@ -707,7 +707,7 @@ io_event_create(int fd, short what, void (*cbfunc) (int, short))

 	assert(fd >= 0);
 #if defined(IO_USE_SELECT) && defined(FD_SETSIZE)
-	if (fd >= FD_SETSIZE) {
+	if (io_masterfd < 0 && fd >= FD_SETSIZE) {
 		Log(LOG_ERR,
 		    "fd %d exceeds FD_SETSIZE (%u) (select can't handle more file descriptors)",
 		    fd, FD_SETSIZE);

-----END OF PAGE-----