From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 5 Mar 2013 10:24:03 +0000 (-0800)
Subject: Reverting the changeset c31d700dea8b made for Issue #12921
X-Git-Tag: v2.7.4rc1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6234cc0098bf10feb57267c2e5facaeeeabdd3e5;p=thirdparty%2FPython%2Fcpython.git

Reverting the changeset c31d700dea8b made for Issue #12921
---

diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index ce9ade963e91..deaf2f960b83 100644
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -365,7 +365,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, short)
+        self.send_response(code, message)
         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 8b90f7c841e4..588a5c640255 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -214,10 +214,6 @@ 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.