X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-socket-manager.cpp;h=6e5f24dfbbd96c1efb4fa3daf4eaf3f6794c928c;hb=71b6a2c41c24d62fb4b195893b63fc7e1e158adb;hp=099ec7653a88b138c9c777289d370f524dd8164a;hpb=26b3f7f15abcb69aaf00fb6bdaf410ff3e7de14c;p=yazpp-moved-to-github.git

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 099ec76..6e5f24d 100644
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -1,10 +1,15 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-socket-manager.cpp,v $
- * Revision 1.8  1999-12-06 13:52:45  adam
+ * Revision 1.10  2000-09-08 10:23:42  adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.9  2000/08/07 14:19:59  adam
+ * Fixed serious bug regarding timeouts. Improved logging for proxy.
+ *
+ * Revision 1.8  1999/12/06 13:52:45  adam
  * Modified for new location of YAZ header files. Experimental threaded
  * operation.
  *
@@ -206,9 +211,12 @@ int Yaz_SocketManager::processEvent()
 	    event->event = mask;
 	    putEvent (event);
 	}
-	else if (p->timeout && now >= p->last_activity + (int) (p->timeout))
+	else if (p->timeout && p->last_activity && 
+		 now >= p->last_activity + (int) (p->timeout))
 	{
 	    YazSocketEvent *event = new YazSocketEvent;
+	    logf (LOG_LOG, "timeout now = %ld last_activity=%ld timeout=%d",
+		  now, p->last_activity, p->timeout);
 	    p->last_activity = now;
 	    event->observer = p->observer;
 	    event->event = YAZ_SOCKET_OBSERVE_TIMEOUT;