[svn] - fix a bug here

diff --git a/ChangeLog b/ChangeLog
index dce572af1f68a1ad3e43e428e6e187c476f92a87..3967173a05989eeb4c7df0ccc56894337e3d49f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+nenolod     2007/05/07 02:57:50 UTC    (20070507-3442)
+  Log:
+  - regen configure
+  
+
+  Changes:     Modified:
+  +114 -1      trunk/configure (File Modified) 
+
+
 nenolod     2007/05/07 02:53:54 UTC    (20070507-3440)
   Log:
   - remove "ASM hashing code" from the configure overview

diff --git a/include/serno.h b/include/serno.h
index e14c164cd1e8e175f90ae3430a2fb82bd07597c5..b03706e8f6a7fb8e6a9ba8b7ea8e771c2005fa1d 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070507-3440"
+#define SERNO "20070507-3442"

diff --git a/libcharybdis/epoll.c b/libcharybdis/epoll.c
index 30565a200ca8b59f29bffc546b4b53e254f1f72f..5a30ef55bd4cc5c163cc86a6e355c779170370df 100644 (file)
--- a/libcharybdis/epoll.c
+++ b/libcharybdis/epoll.c
@@ -23,7 +23,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: epoll.c 3374 2007-04-03 10:49:11Z nenolod $
+ *  $Id: epoll.c 3444 2007-05-09 00:32:08Z nenolod $
  */
 
 #include "config.h"
@@ -112,7 +112,9 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler,
        if(timeout)
                F->timeout = CurrentTime + (timeout / 1000);
 
-       if(!(F->pflags & EPOLLIN) && !(F->pflags & EPOLLOUT))
+       if(old_flags == 0 && F->pflags == 0)
+               return;
+       else if(F->pflags <= 0)
                op = EPOLL_CTL_DEL;
        else if(old_flags == 0 && F->pflags > 0)
                op = EPOLL_CTL_ADD;
@@ -131,6 +133,8 @@ comm_setselect(int fd, fdlist_t list, unsigned int type, PF * handler,
                libcharybdis_log("comm_setselect(): epoll_ctl failed: %s", strerror(errno));
                abort();
        }
+
+
 }
 
 /*