Minor bug fix regarding traffic logging of redirected requests

stamparm · stamparm · commit 09e7f4f69783 · 2013-04-30T17:46:26.000+02:00
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -226,6 +226,7 @@ def getPage(**kwargs):
         # url splitted with space char while urlencoding it in the later phase
         url = url.replace(" ", "%20")
 
+        conn = None
         code = None
         page = None
 
@@ -554,7 +555,12 @@ def getPage(**kwargs):
 
         processResponse(page, responseHeaders)
 
-        responseMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, code, status)
+        if conn and hasattr(conn, "redcode"):
+            responseMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, conn.code, status)
+            requestMsg = requestMsg.replace("%s HTTP/" % url, "%s HTTP/" % conn.redurl, 1)
+        else:
+            responseMsg += "[#%d] (%d %s):\n" % (threadData.lastRequestUID, code, status)
+
         if responseHeaders:
             logHeaders = "\n".join("%s: %s" % (getUnicode(key.capitalize() if isinstance(key, basestring) else key), getUnicode(value)) for (key, value) in responseHeaders.items())
 
