From e4b23c9beb671f24f7e7e74e47c07f237189647d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 16 Jun 2015 12:00:56 +0200 Subject: [PATCH] Minor fix regarding POST redirects (ML) --- lib/request/connect.py | 6 ++++++ lib/request/redirecthandler.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/request/connect.py b/lib/request/connect.py index 9951ed5d0..b3fe886f1 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -639,6 +639,12 @@ class Connect(object): _ = urlparse.urlsplit(conn.redurl) _ = ("%s%s" % (_.path or "/", ("?%s" % _.query) if _.query else "")) requestMsg = re.sub("(\n[A-Z]+ ).+?( HTTP/\d)", "\g<1>%s\g<2>" % re.escape(getUnicode(_)), requestMsg, 1) + + if kb.resendPostOnRedirect is False: + requestMsg = re.sub("(\[#\d+\]:\n)POST ", "\g<1>GET ", requestMsg) + requestMsg = re.sub("(?i)Content-length: \d+\n", "", requestMsg) + requestMsg = re.sub("(?s)\n\n.+", "\n", requestMsg) + responseMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, conn.code, status) else: responseMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, code, status) diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py index 23b5a5774..73fa73f19 100644 --- a/lib/request/redirecthandler.py +++ b/lib/request/redirecthandler.py @@ -61,8 +61,8 @@ class SmartRedirectHandler(urllib2.HTTPRedirectHandler): kb.resendPostOnRedirect = choice.upper() == 'Y' - if kb.resendPostOnRedirect: - self.redirect_request = self._redirect_request + if kb.resendPostOnRedirect: + self.redirect_request = self._redirect_request def _redirect_request(self, req, fp, code, msg, headers, newurl): newurl = newurl.replace(' ', '%20')