p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #28271 -- Added charset to technical_500_response() AJAX response.

This commit is contained in:
partizan 2017-06-05 21:43:40 +03:00 committed by Tim Graham
parent 6352d06cd0
commit ff099f9db8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/views/debug.py
View File

@ -86,7 +86,7 @@ def technical_500_response(request, exc_type, exc_value, tb, status_code=500):
reporter = ExceptionReporter(request, exc_type, exc_value, tb) reporter = ExceptionReporter(request, exc_type, exc_value, tb)
if request.is_ajax(): if request.is_ajax():
text = reporter.get_traceback_text() text = reporter.get_traceback_text()
return HttpResponse(text, status=status_code, content_type='text/plain') return HttpResponse(text, status=status_code, content_type='text/plain; charset=utf-8')
else: else:
html = reporter.get_traceback_html() html = reporter.get_traceback_html()
return HttpResponse(html, status=status_code, content_type='text/html') return HttpResponse(html, status=status_code, content_type='text/html')

5
tests/view_tests/tests/test_debug.py
View File

@ -1079,6 +1079,11 @@ class AjaxResponseExceptionReporterFilter(ExceptionReportTestMixin, LoggingCaptu
with self.settings(DEBUG=False): with self.settings(DEBUG=False):
self.verify_unsafe_response(custom_exception_reporter_filter_view, check_for_vars=False) self.verify_unsafe_response(custom_exception_reporter_filter_view, check_for_vars=False)
@override_settings(DEBUG=True, ROOT_URLCONF='view_tests.urls')
def test_ajax_response_encoding(self):
response = self.client.get('/raises500/', HTTP_X_REQUESTED_WITH='XMLHttpRequest')
self.assertEqual(response['Content-Type'], 'text/plain; charset=utf-8')
class HelperFunctionTests(SimpleTestCase): class HelperFunctionTests(SimpleTestCase):