summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2013-03-05 09:22:57 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2013-03-05 09:22:57 (GMT)
commit3fb066d286af3ec5b89b871628b01081deda9039 (patch)
tree826f2b93c5d42e1d45e9f909821d82090ff8be31
parent44d5214927e428e6837310fb0cb694b42f6d8bb6 (diff)
downloadcpython-3fb066d286af3ec5b89b871628b01081deda9039.zip
cpython-3fb066d286af3ec5b89b871628b01081deda9039.tar.gz
cpython-3fb066d286af3ec5b89b871628b01081deda9039.tar.bz2
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.
-rw-r--r--Lib/http/server.py2
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 5569037..22fc035 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, message)
+ self.send_response(code, shortmsg)
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 e9c78b3..1a112e1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,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.