major bug fix for --keep-alive option in multithreading mode (that 'shitty' _headers = {} made a one shared object for all connection objects)

stamparm · stamparm · commit dc50543ea42e · 2010-10-13T23:01:23.000Z
diff --git a/extra/keepalive/keepalive.py b/extra/keepalive/keepalive.py
@@ -295,10 +295,10 @@ def readlines(self, sizehint = 0):
 class HTTPConnection(httplib.HTTPConnection):
     # use the modified response class
     response_class = HTTPResponse
-    _headers = {}
+    _headers = None
 
     def clearheaders(self):
-        self._headers.clear()
+        self._headers = {}
 
     def putheader(self, header, value):
         """Send a request header line to the server.
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -347,10 +347,7 @@ def queryPage(value=None, place=None, content=False, getSeqMatcher=False, silent
             if kb.nullConnection == "HEAD":
                 pageLength = int(headers['Content-Length'])
             elif kb.nullConnection == "Range":
-                if 'Content-Range' in headers:
-                    pageLength = int(headers['Content-Range'][headers['Content-Range'].find('/') + 1:])
-                elif 'content-length' in headers: #sometimes
-                    pageLength = int(headers['content-length'])
+                pageLength = int(headers['Content-Range'][headers['Content-Range'].find('/') + 1:])
 
         if not pageLength:
             page, headers = Connect.getPage(url=uri, get=get, post=post, cookie=cookie, ua=ua, silent=silent, method=method, auxHeaders=auxHeaders, response=response, raise404=raise404)
