X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=82bc0a38819b905ec8d3c7e2348baca1f9208c0f;hb=bc05c522e728c4772ef3ed268fc3aca0b2e1f1e4;hp=163cb33e9308bb2f45cf4d845fe3ddbd33c41044;hpb=36e5968d005bb3cdc7b045bfccfe1a6aabb4c54e;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 163cb33..82bc0a3 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-socket-manager.cpp,v 1.20 2003-07-25 19:27:36 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.22 2003-12-16 11:26:42 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -199,12 +199,14 @@ int Yaz_SocketManager::processEvent()
 	    event->observer = p->observer;
 	    event->event = mask;
 	    putEvent (event);
+
+	    yaz_log (m_log, "putEvent I/O mask=%d", mask);
 	}
-	else if (res == 0 && p->timeout && p->timeout_this == timeout)
+	else if (p->timeout && (now - p->last_activity) >= p->timeout)
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
             assert (p->last_activity);
-	    yaz_log (m_log, "timeout, now = %ld last_activity=%ld timeout=%d",
+	    yaz_log (m_log, "putEvent timeout, now = %ld last_activity=%ld timeout=%d",
                      now, p->last_activity, p->timeout);
 	    p->last_activity = now;
 	    event->observer = p->observer;