diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-03-05 10:26:50 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-03-05 10:26:50 (GMT) |
| commit | 884f0585a40d2e3203ee0512aa2f5a39ce660556 (patch) | |
| tree | ac35037009f97e54c8c3526b06f5a04f3aa3b59f | |
| parent | c37f835a431822a4756a272c248e3c8e3211443a (diff) | |
| parent | 1e7551dc87538ef98b1f3081e782a7f27da017c1 (diff) | |
| download | cpython-884f0585a40d2e3203ee0512aa2f5a39ce660556.zip cpython-884f0585a40d2e3203ee0512aa2f5a39ce660556.tar.gz cpython-884f0585a40d2e3203ee0512aa2f5a39ce660556.tar.bz2 | |
Reverting the changeset 5d76a4746d9d made for Issue #12921
| -rw-r--r-- | Lib/http/server.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Lib/http/server.py b/Lib/http/server.py index 18a51fe..c4ac703 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -425,7 +425,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() @@ -193,10 +193,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. |