summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2013-03-05 01:26:33 -0800
committerSenthil Kumaran <senthil@uthcode.com>2013-03-05 01:26:33 -0800
commit24431f180203905ab882c18c7149d903b6b3c629 (patch)
tree90831018748baea1438d62c0c4108b2bb8052ed4
parentf7f8972a59b5ca93a07653da041b375a15fb3755 (diff)
parentc37f835a431822a4756a272c248e3c8e3211443a (diff)
downloadcpython-git-24431f180203905ab882c18c7149d903b6b3c629.tar.gz
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/http/server.py2
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 1873b13105..bb64ca6faf 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -426,7 +426,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
content = (self.error_message_format %
{'code': code, 'message': _quote_html(message), 'explain': explain})
body = content.encode('UTF-8', 'replace')
- self.send_response(code, message)
+ self.send_response(code, shortmsg)
self.send_header("Content-Type", self.error_content_type)
self.send_header('Connection', 'close')
self.send_header('Content-Length', int(len(body)))
diff --git a/Misc/NEWS b/Misc/NEWS
index 0a895a2133..1bc304fbbf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -275,6 +275,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.