Reverting the changeset b87792757ee8 made for Issue #12921

diff --cc Lib/http/server.py
index bb64ca6fafd312f728e46474ed3481039dbfc079,c4ac703d2daf0f6cc4ef1b945219ed7c614492d6..1873b13105e1bc86d484c52558e85e568357e386
--- 1/Lib/http/server.py
--- 2/Lib/http/server.py
+++ b/Lib/http/server.py
@@@ -425,14 -425,12 +425,14 @@@ class BaseHTTPRequestHandler(socketserv
          # 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, shortmsg)
 +        body = content.encode('UTF-8', 'replace')
+         self.send_response(code, message)
          self.send_header("Content-Type", self.error_content_type)
          self.send_header('Connection', 'close')
 +        self.send_header('Content-Length', int(len(body)))
          self.end_headers()
          if self.command != 'HEAD' and code >= 200 and code not in (204, 304):
 -            self.wfile.write(content.encode('UTF-8', 'replace'))
 +            self.wfile.write(body)
  
      def send_response(self, code, message=None):
          """Add the response header to the headers buffer and log the

diff --cc Misc/NEWS
Simple merge