From 0a10b97e333df72561409a5e38e2e2a38e016db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Sat, 17 Feb 2018 15:01:25 +0100
Subject: [PATCH] Client: fix query parameters handling in `rpc call`

---
 src/lib_rpc_http/RPC_client.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib_rpc_http/RPC_client.ml b/src/lib_rpc_http/RPC_client.ml
index f77f9f0ca..a446e1327 100644
--- a/src/lib_rpc_http/RPC_client.ml
+++ b/src/lib_rpc_http/RPC_client.ml
@@ -417,8 +417,9 @@ class http_ctxt config media_types : RPC_context.json =
   let logger = config.logger in
   object
     method generic_json_call meth ?body uri =
-      let uri = Uri.with_path base (Uri.path uri) in
-      let uri = Uri.with_query uri (Uri.query uri) in
+      let path = Uri.path uri and query = Uri.query uri in
+      let uri = Uri.with_path base path in
+      let uri = Uri.with_query uri query in
       generic_json_call ~logger meth ?body uri
     method call_service
       : 'm 'p 'q 'i 'o.