SRU GET/Solr base URLs may hold additional ?args YAZ-729

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

diff --git a/src/srwutil.c b/src/srwutil.c
index 5a4f576..017ec5e 100644 (file)
--- a/src/srwutil.c
+++ b/src/srwutil.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -242,6 +242,8 @@ static void grab_charset(ODR o, const char *content_type, char **charset)
             *charset = odr_strdup(o, charset_p);
             while (charset_p[i] && charset_p[i] != sep)
             {
+                if (!sep && strchr("; \n\r", charset_p[i]))
+                    break;
                 if (charset_p[i] == '\\' && charset_p[i+1])
                     i++;
                 (*charset)[j++] = charset_p[i++];
@@ -1062,7 +1064,8 @@ int yaz_sru_get_encode(Z_HTTP_Request *hreq, Z_SRW_PDU *srw_pdu,
     path = (char *)
         odr_malloc(encode, strlen(hreq->path) + strlen(uri_args) + 4);
 
-    sprintf(path, "%s?%s", hreq->path, uri_args);
+    sprintf(path, "%s%c%s", hreq->path, strchr(hreq->path, '?') ? '&' : '?', 
+            uri_args);
     hreq->path = path;
 
     z_HTTP_header_add_content_type(encode, &hreq->headers,