From 1f5e6606a72092e39ec7f23d7be8eab7f0328406 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 25 Aug 2015 02:03:56 +0200 Subject: [PATCH] Fixes #1357 --- lib/request/connect.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/request/connect.py b/lib/request/connect.py index 26039a92f..63bb1ba22 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -893,7 +893,12 @@ class Connect(object): originals = {} keywords = keyword.kwlist - for item in filter(None, (get, post if not kb.postHint else None)): + if not get and PLACE.URI in conf.parameters: + query = urlparse.urlsplit(uri).query or "" + else: + query = None + + for item in filter(None, (get, post if not kb.postHint else None, query)): for part in item.split(delimiter): if '=' in part: name, value = part.split('=', 1) @@ -956,6 +961,10 @@ class Connect(object): found = True post = re.sub(regex, "\g<1>%s\g<3>" % value, post) + if re.search(regex, (query or "")): + found = True + uri = re.sub(regex.replace(r"\A", r"\?"), "\g<1>%s\g<3>" % value, uri) + regex = r"((\A|%s)%s=).+?(%s|\Z)" % (re.escape(conf.cookieDel or DEFAULT_COOKIE_DELIMITER), name, re.escape(conf.cookieDel or DEFAULT_COOKIE_DELIMITER)) if re.search(regex, (cookie or "")): found = True