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.

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 5569037427dd9c8e6d05bf2566b6f9336086d09d..22fc035e0195ff2527c0f6efe1e87b2b3f019143 100644 (file)
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -421,7 +421,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, shortmsg)
         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 e9c78b3b31a8fe52b3c07f513e1fe8482f01cc23..1a112e1ad0cc41a443798cec1e671eca8d3fa1bf 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,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.