From ff1bbba92aad261df1ebd8fd8cc189c104e113b0 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 18 Dec 2010 18:04:38 +0000 Subject: Merged revisions 87373,87381 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r87373 | senthil.kumaran | 2010-12-18 17:55:23 +0100 (sam., 18 déc. 2010) | 3 lines Fix Issue6791 - Limit the HTTP header readline with _MAXLENGTH. Patch by Antoine Pitrou ........ r87381 | antoine.pitrou | 2010-12-18 18:59:18 +0100 (sam., 18 déc. 2010) | 3 lines NEWS entry for r87373 ........ --- Lib/http/server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Lib/http/server.py') diff --git a/Lib/http/server.py b/Lib/http/server.py index 5ac6c0d204e..8de604a739e 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -314,8 +314,12 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler): self.command, self.path, self.request_version = command, path, version # Examine the headers and look for a Connection directive. - self.headers = http.client.parse_headers(self.rfile, - _class=self.MessageClass) + try: + self.headers = http.client.parse_headers(self.rfile, + _class=self.MessageClass) + except http.client.LineTooLong: + self.send_error(400, "Line too long") + return False conntype = self.headers.get('Connection', "") if conntype.lower() == 'close': -- cgit v1.2.3