summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2013-03-05 09:21:13 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2013-03-05 09:21:13 (GMT)
commitc74e764c21307cf484f60ec1b24d1f5cf3a8b496 (patch)
tree1eff240f127c83fa7a4b87ba62dbf59e06e400de
parent757408a2f3f52a253bdd52de07b8e9a1e9e73384 (diff)
downloadcpython-c74e764c21307cf484f60ec1b24d1f5cf3a8b496.zip
cpython-c74e764c21307cf484f60ec1b24d1f5cf3a8b496.tar.gz
cpython-c74e764c21307cf484f60ec1b24d1f5cf3a8b496.tar.bz2
Fix Issue #12921: BaseHTTPServer's send_error should send the correct error
response message when send_error includes a message in addition to error status. Patch contributed by Karl.
-rw-r--r--Lib/BaseHTTPServer.py2
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index deaf2f9..ce9ade9 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -365,7 +365,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
# using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201)
content = (self.error_message_format %
{'code': code, 'message': _quote_html(message), 'explain': explain})
- self.send_response(code, message)
+ self.send_response(code, short)
self.send_header("Content-Type", self.error_content_type)
self.send_header('Connection', 'close')
self.end_headers()
diff --git a/Misc/NEWS b/Misc/NEWS
index 588a5c6..8b90f7c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -214,6 +214,10 @@ Core and Builtins
Library
-------
+- Issue #12921: BaseHTTPServer's send_error should send the correct error
+ response message when send_error includes a message in addition to error
+ status. Patch submitted by Karl.
+
- Issue #17278: Fix a crash in heapq.heappush() and heapq.heappop() when
the list is being resized concurrently.