From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 5 Mar 2013 10:25:58 +0000 (-0800)
Subject: Reverting the changeset 5126e62c60af made for Issue #12921
X-Git-Tag: v3.2.4rc1~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e7551dc87538ef98b1f3081e782a7f27da017c1;p=python

Reverting the changeset 5126e62c60af made for Issue #12921
---

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 22fc035e01..5569037427 100644
--- 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, shortmsg)
+        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 1a112e1ad0..e9c78b3b31 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,10 +233,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.