Make timeout(0) wait until write mask is cleared

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index a175d1d..4aff767 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.95 2004-01-30 12:02:21 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.96 2004-02-02 11:17:45 adam Exp $
  */
 
 #include <assert.h>
@@ -103,6 +103,7 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
     m_config = 0;
     m_marcxml_flag = 0;
     m_stylesheet_xsp = 0;
+    m_stylesheet_nprl = 0;
     m_s2z_stylesheet = 0;
     m_s2z_database = 0;
     m_schema = 0;

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 0094e1d..5fd8743 100644 (file)
--- 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.25 2004-01-30 00:38:28 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.26 2004-02-02 11:17:45 adam Exp $
  */
 #include <assert.h>
 #ifdef WIN32
@@ -141,7 +141,8 @@ 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))
        {
            int timeout_this;
            timeout_this = p->timeout;
@@ -194,7 +195,7 @@ int Yaz_SocketManager::processEvent()
        if (FD_ISSET(fd, &except))
            mask |= YAZ_SOCKET_OBSERVE_EXCEPT;
        
-       if (res > 0 && mask)
+       if (mask)
        {
            YazSocketEvent *event = new YazSocketEvent;
            p->last_activity = now;
@@ -204,7 +205,11 @@ int Yaz_SocketManager::processEvent()
 
            yaz_log (m_log, "putEvent I/O mask=%d", mask);
        }
-       else if ((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);