From 6c1bb7b4e3a04f6dcf5d875ebe44c26dccc28e4d Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Sun, 29 Sep 2013 13:59:06 -0400
Subject: [PATCH] - Issue #16037: HTTPMessage.readheaders() raises an
 HTTPException when more   than 100 headers are read.  Adapted from patch by
 Jyrki Pulliainen.

---
 Lib/httplib.py           | 7 +++++++
 Lib/test/test_httplib.py | 7 +++++++
 Misc/NEWS                | 3 +++
 3 files changed, 17 insertions(+)

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 680e875041..8c2eab6dfe 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -211,6 +211,10 @@ responses = {
 # maximal amount of data to read at one time in _safe_read
 MAXAMOUNT = 1048576
 
+# maximum amount of headers accepted
+_MAXHEADERS = 100
+
+
 class HTTPMessage(mimetools.Message):
 
     def addheader(self, key, value):
@@ -267,6 +271,8 @@ class HTTPMessage(mimetools.Message):
         elif self.seekable:
             tell = self.fp.tell
         while True:
+            if len(hlist) > _MAXHEADERS:
+                raise HTTPException("got more than %d headers" % _MAXHEADERS)
             if tell:
                 try:
                     startofline = tell()
@@ -1203,6 +1209,7 @@ class BadStatusLine(HTTPException):
         self.args = line,
         self.line = line
 
+
 # for backwards compatibility
 error = HTTPException
 
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 730e8852a1..b5f8a79543 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -152,6 +152,13 @@ class BasicTest(TestCase):
         if resp.read() != "":
             self.fail("Did not expect response from HEAD request")
 
+    def test_too_many_headers(self):
+        headers = '\r\n'.join('Header%d: foo' % i for i in xrange(200)) + '\r\n'
+        text = ('HTTP/1.1 200 OK\r\n' + headers)
+        s = FakeSocket(text)
+        r = httplib.HTTPResponse(s)
+        self.assertRaises(httplib.HTTPException, r.begin)
+
     def test_send_file(self):
         expected = 'GET /foo HTTP/1.1\r\nHost: example.com\r\n' \
                    'Accept-Encoding: identity\r\nContent-Length:'
diff --git a/Misc/NEWS b/Misc/NEWS
index 8a0db6e1ca..0f31f1e299 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #16037: HTTPMessage.readheaders() raises an HTTPException when more
+  than 100 headers are read.  Adapted from patch by Jyrki Pulliainen.
+
 - Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
   limiting the call to readline().  Original patch by Michał
   Jastrzębski and Giampaolo Rodola.
-- 
2.50.1