minor fixes

stamparm · stamparm · commit 430fd5cd63d2 · 2011-01-25T16:05:06.000Z
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -95,7 +95,7 @@ def getPage(**kwargs):
         requestMsg     += "%s" % urlparse.urlsplit(url)[2] or "/"
         responseMsg     = "HTTP response "
         requestHeaders  = ""
-        responseHeaders = ""
+        responseHeaders = None
         logHeaders      = ""
 
         try:
@@ -253,6 +253,7 @@ def getPage(**kwargs):
 
         except urllib2.HTTPError, e:
             page = None
+            responseHeaders = None
             try:
                 page = e.read()
                 responseHeaders = e.info()
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -247,7 +247,7 @@ def webInit(self):
 
                 elif "<%" in uplPage or "<?" in uplPage:
                     warnMsg  = "file stager uploaded "
-                    warnMsg += "on '%s' but not dynamically interpreted" % uriPage
+                    warnMsg += "on '%s' but not dynamically interpreted" % localPath
                     logger.warn(warnMsg)
                     continue
 
