summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-04-23 23:46:46 +0800
committerSenthil Kumaran <senthil@uthcode.com>2012-04-23 23:46:46 +0800
commit0267185088e407144cf3d20f8e6b346e5d109e75 (patch)
tree2d557a5af482827b267ce0a388ec76fb039ce125
parenteda1959d076caaa13a84fc6846b6acd017921ca4 (diff)
downloadcpython-git-0267185088e407144cf3d20f8e6b346e5d109e75.tar.gz
Fix for Issue13684 - httplib tunnel infinite loop
-rw-r--r--Lib/httplib.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/httplib.py b/Lib/httplib.py
index 13629c4a96..5d16e53c4c 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -748,7 +748,11 @@ class HTTPConnection:
line = response.fp.readline(_MAXLINE + 1)
if len(line) > _MAXLINE:
raise LineTooLong("header line")
- if line == '\r\n': break
+ if not line:
+ # for sites which EOF without sending trailer
+ break
+ if line == '\r\n':
+ break
def connect(self):