Backport fix for SF bug 666219.

diff --git a/Lib/httplib.py b/Lib/httplib.py
index bb4ab7aa75bee7644d3905ed4a4610a957fef5b3..34e95438a3d6e67bccd02c4f1861a59a6a3c97c6 100644 (file)
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -231,6 +231,10 @@ class HTTPResponse:
         line = self.fp.readline()
         if self.debuglevel > 0:
             print "reply:", repr(line)
+        if not line:
+            # Presumably, the server closed the connection before
+            # sending a valid response.
+            raise BadStatusLine(line)
         try:
             [version, status, reason] = line.split(None, 2)
         except ValueError: