Update man page. Mention SIGHUP.

[yazpp-moved-to-github.git] / src / yaz-proxy.cpp

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 39f53da..853d5ee 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy.cpp,v 1.57 2003-10-13 19:16:29 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.60 2003-10-16 08:28:10 adam Exp $
  */
 
 #include <assert.h>
@@ -53,7 +53,7 @@ static const char *apdu_name(Z_APDU *apdu)
 }
 
 Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
-                    Yaz_Proxy *parent = 0) :
+                    Yaz_Proxy *parent) :
     Yaz_Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60)
 {
     m_PDU_Observable = the_PDU_Observable;
@@ -985,7 +985,7 @@ Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
     if (apdu->which == Z_APDU_searchRequest)
     {
        Z_SearchRequest *sr = apdu->u.searchRequest;
-       if (*sr->smallSetUpperBound > 0 || *sr->largeSetLowerBound > 1)
+       if (*sr->smallSetUpperBound > 0 || *sr->mediumSetPresentNumber > 0)
        {
            int err = 0;
            char *addinfo = 0;
@@ -1189,8 +1189,6 @@ void Yaz_ProxyClient::shutdown()
 {
     yaz_log (LOG_LOG, "%sShutdown (proxy to target) %s", get_session_str(),
             get_hostname());
-    m_waiting = 1;
-    m_root->pre_init();
     delete m_server;
     delete this;
 }
@@ -1215,7 +1213,6 @@ void Yaz_ProxyClient::connectNotify()
     const char *h = get_hostname();
     yaz_log (LOG_LOG, "%sConnection accepted by %s timeout=%d", s, h,
             m_target_idletime);
-    int to;
     timeout(m_target_idletime);
     if (!m_server)
        pre_init_client();
@@ -1362,6 +1359,8 @@ void Yaz_ProxyClient::timeoutNotify()
 {
     yaz_log (LOG_LOG, "%sTimeout (proxy to target) %s", get_session_str(),
             get_hostname());
+    m_waiting = 1;
+    m_root->pre_init();
     shutdown();
 }