Use CONNECT for SSL backends and for Z39.50 thru HTTP proxy YAZ-825

[yaz-moved-to-github.git] / src / zoom-z3950.c

diff --git a/src/zoom-z3950.c b/src/zoom-z3950.c
index 63202f3..701f5a4 100644 (file)
--- a/src/zoom-z3950.c
+++ b/src/zoom-z3950.c
@@ -609,7 +609,7 @@ zoom_ret ZOOM_connection_Z3950_send_init(ZOOM_connection c)
         auth->u.open = odr_strdup(c->odr_out, c->user);
         ireq->idAuthentication = auth;
     }
-    if (c->proxy)
+    if (c->proxy_mode)
     {
         yaz_oi_set_string_oid(&ireq->otherInfo, c->odr_out,
                               yaz_oid_userinfo_proxy, 1, c->host_port);
@@ -1577,9 +1577,10 @@ zoom_ret ZOOM_connection_Z3950_search(ZOOM_connection c)
 
     if (resultset->live_set)
     {
-        if (*start + *count > resultset->size)
-            ZOOM_set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
-                       0, 0);
+        if (*start >= resultset->size)
+            *count = 0;
+        else if (*start + *count >= resultset->size)
+            *count = resultset->size - *start;
     }
 
     if (c->error)                  /* don't continue on error */