diff -r 66d0f6ef2a7f Lib/http/server.py
--- a/Lib/http/server.py	Thu Feb 28 18:03:16 2013 +0200
+++ b/Lib/http/server.py	Mon Mar 04 11:25:09 2013 -0500
@@ -425,7 +425,7 @@
         # 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()