X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=5fd87431358d8ad83174e40897d92f8db1c2b45b;hb=0e5966272921cc8253e4395fcf985d490f27de0b;hp=3215d3b7b82dc3aefccecab32fb5c032aa330ac3;hpb=277e55dae549f6fa6b9ad22d8ebd89af53bcd71b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 3215d3b..5fd8743 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.23 2004-01-05 11:31:04 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.26 2004-02-02 11:17:45 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -141,9 +141,10 @@ int Yaz_SocketManager::processEvent()
         }
 	if (fd > max)
 	    max = fd;
-	if (p->timeout >= 0)
+	if (p->timeout > 0 ||
+	    (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
 	{
-	    unsigned timeout_this;
+	    int timeout_this;
 	    timeout_this = p->timeout;
 	    if (p->last_activity)
 		timeout_this -= now - p->last_activity;
@@ -179,6 +180,7 @@ int Yaz_SocketManager::processEvent()
 	    yaz_log (LOG_LOG|LOG_WARN, "select");
 	    return -1;
 	}
+    yaz_log(m_log, "select returned res=%d", res);
     now = time(0);
     for (p = m_observers; p; p = p->next)
     {
@@ -203,7 +205,11 @@ int Yaz_SocketManager::processEvent()
 
 	    yaz_log (m_log, "putEvent I/O mask=%d", mask);
 	}
-	else if (p->timeout && (now - p->last_activity) >= p->timeout)
+	else if (
+	    (p->timeout > 0 ||
+	     (p->timeout == 0 && (p->mask & YAZ_SOCKET_OBSERVE_WRITE) == 0))
+	    &&
+	    (now - p->last_activity) >= p->timeout)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);