From: Bob Halley <halley@dnspython.org>
Date: Tue, 16 Jun 2020 17:19:03 +0000 (-0700)
Subject: simplify DoH GET
X-Git-Tag: v2.0.0rc1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d007e049da9dbda3c5d290a718b126309324ae;p=thirdparty%2Fdnspython.git

simplify DoH GET
---

diff --git a/dns/query.py b/dns/query.py
index 7402189b..6fe802d0 100644
--- a/dns/query.py
+++ b/dns/query.py
@@ -350,10 +350,10 @@ def https(q, where, timeout=None, port=443, source=None, source_port=0,
                                     stream=True, timeout=timeout,
                                     verify=verify)
         else:
-            wire = base64.urlsafe_b64encode(wire).decode('utf-8').strip("=")
-            url += "?dns={}".format(wire)
-            response = session.get(url, headers=headers, stream=True,
-                                   timeout=timeout, verify=verify)
+            wire = base64.urlsafe_b64encode(wire).rstrip(b"=")
+            response = session.get(url, headers=headers,
+                                   timeout=timeout, verify=verify,
+                                   params={"dns" : wire})
 
     # see https://tools.ietf.org/html/rfc8484#section-4.2.1 for info about DoH
     # status codes