Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/src/statserv.c b/src/statserv.c
index 4a469de..0e6a3e8 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -1402,7 +1402,7 @@ int check_options(int argc, char **argv)
             fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
                     " -l <logfile> -u <user> -c <config> -t <minutes>"
                     " -k <kilobytes> -d <daemon> -p <pidfile> -C certfile"
-                    " -ziDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
+                    " -zKiDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
             return 1;
         }
     }

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 00158ec..dc52963 100644 (file)
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -1612,6 +1612,8 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
                 c->reconnect_ok = 0;
             }
         }
+        else
+            c->reconnect_ok = 1; /* if the server closes anyway */
     }
 }
 #endif
@@ -1682,7 +1684,6 @@ static int do_read(ZOOM_connection c)
 #endif
             }
         }
-        c->reconnect_ok = 0;
     }
     return 1;
 }