From 8865fe69d7c848979bb9f903680160bc7df03222 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 4 Oct 2012 18:26:07 +0200 Subject: [PATCH] Minor cleanup --- lib/core/settings.py | 4 ++-- lib/request/connect.py | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 460ffe03e..085a93adc 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -467,8 +467,8 @@ VIEWSTATE_REGEX = r'(?P__VIEWSTATE[^"]*)[^>]+value="(?P[^"]+)' # Number of rows to generate inside the full union test for limited output (mustn't be too large to prevent payload length problems) LIMITED_ROWS_TEST_NUMBER = 15 -# Regular expression for soap message recognition -SOAP_RECOGNITION_REGEX = r"(?s)\A(<\?xml[^>]+>)?\s*<([^> ]+)( [^>]+)?>.+]+>)?\s*<([^> ]+)( [^>]+)?>.+\s*\Z" # Regular expressing used for detecting JSON-like POST data JSON_RECOGNITION_REGEX = r'(?s)\A\s*\{.*"[^"]+"\s*:\s*("[^"]+"|\d+).*\}\s*\Z' diff --git a/lib/request/connect.py b/lib/request/connect.py index 5d1f4d1c8..5f575815e 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -683,16 +683,6 @@ class Connect: get = urlencode(get, limit=True) if post: - if conf.skipUrlEncode is None: - _ = (post or "").strip() - if _.startswith('<') and _.endswith('>'): - msg = "provided POST data looks " - msg += "like it's in XML format. " - msg += "Do you want to turn off URL encoding " - msg += "which is usually causing problems " - msg += "in this kind of situations? [Y/n]" - skipUrlEncode = conf.skipUrlEncode = readInput(msg, default="Y").upper() != "N" - if place not in (PLACE.POST, PLACE.CUSTOM_POST) and hasattr(post, UNENCODED_ORIGINAL_VALUE): post = getattr(post, UNENCODED_ORIGINAL_VALUE) elif not skipUrlEncode and kb.postHint not in POST_HINT_CONTENT_TYPES.keys():