Fix for an Issue #152

stamparm · stamparm · commit 76338add1700 · 2012-08-20T10:41:43.000+02:00
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
@@ -953,6 +953,9 @@ def checkNullConnection():
     Reference: http://www.wisec.it/sectou.php?id=472f952d79293
     """
 
+    if conf.data:
+        return False
+
     infoMsg = "testing NULL connection to the target url"
     logger.info(infoMsg)
 
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -242,7 +242,7 @@ def getPage(**kwargs):
 
                 return page
 
-            elif any ((refreshing, crawling)):
+            elif any((refreshing, crawling)):
                 pass
 
             elif target:
diff --git a/thirdparty/keepalive/keepalive.py b/thirdparty/keepalive/keepalive.py
@@ -129,7 +129,7 @@ def _start_connection(self, h, req):
                 if not req.headers.has_key('Content-length'):
                     req.headers['Content-length'] = '%d' % len(data)
             else:
-                h.putrequest('GET', req.get_selector())
+                h.putrequest(req.get_method() or 'GET', req.get_selector())
 
             if not req.headers.has_key('Connection'):
                 req.headers['Connection'] = 'keep-alive'
