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.

Lib/BaseHTTPServer.py

@@ -365,7 +365,7 @@ def send_error(self, code, message=None):
         # 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()

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.