[Python-checkins] cpython (merge 3.2 -> 3.3): Fix Issue #12921: BaseHTTPServer's send_error should send the correct error
senthil.kumaran
python-checkins at python.org
Tue Mar 5 10:24:03 CET 2013
http://hg.python.org/cpython/rev/5d76a4746d9d
changeset: 82492:5d76a4746d9d
branch: 3.3
parent: 82486:b691f25c3553
parent: 82491:5126e62c60af
user: Senthil Kumaran <senthil at uthcode.com>
date: Tue Mar 05 01:23:44 2013 -0800
summary:
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.
files:
Lib/http/server.py | 2 +-
Misc/NEWS | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Lib/http/server.py b/Lib/http/server.py
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -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()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -193,6 +193,10 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list