Patch #1966: Break infinite loop in httplib when the servers

implements the chunked encoding incorrectly.

Patch #1966: Break infinite loop in httplib when the servers
implements the chunked encoding incorrectly.
e9c996c1 · Martin v. Löwis · cab74c83 · e9c996c1 · e9c996c1
Commit e9c996c1 authored Feb 12, 2008 by Martin v. Löwis
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

Lib/httplib.py Lib/httplib.py +4 -0

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -571,6 +571,10 @@ class HTTPResponse:
        ### note: we shouldn't have any trailers!
        while True:
            line = self.fp.readline()
+            if not line:
+                # a vanishingly small number of sites EOF without
+                # sending the trailer
+                break
            if line == '\r\n':
                break


--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -83,6 +83,9 @@ Core and builtins
 Library
 -------

+- Patch #1966: Break infinite loop in httplib when the servers
+  implements the chunked encoding incorrectly.
+
 - tarfile.py: Fix reading of xstar archives.

 - #2021: Allow tempfile.NamedTemporaryFile to be used in with statements