diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-04-02 14:39:14 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-04-02 14:39:14 +0200 |
| commit | 76b930ff703af5a1961528a04ae89e090ec8de7b (patch) | |
| tree | 59592676c78ed716efa10f174da3b99fd96a0241 | |
| parent | 4ee8808b44c5a3377ac2c1dfc4ba5fb10d559ef5 (diff) | |
| parent | 06c6d883595a42f758d21679ebdd4bb4f02a5e93 (diff) | |
| download | mitmproxy-76b930ff703af5a1961528a04ae89e090ec8de7b.tar.gz mitmproxy-76b930ff703af5a1961528a04ae89e090ec8de7b.tar.bz2 mitmproxy-76b930ff703af5a1961528a04ae89e090ec8de7b.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
| -rw-r--r-- | mitmproxy/models/http.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py index 4bba35f1..8052b9de 100644 --- a/mitmproxy/models/http.py +++ b/mitmproxy/models/http.py @@ -1,5 +1,6 @@ from __future__ import (absolute_import, print_function, division) from six.moves import http_cookies as Cookie +import cgi import copy import warnings from email.utils import parsedate_tz, formatdate, mktime_tz @@ -421,7 +422,7 @@ def make_error_response(status_code, message, headers=None): </head> <body>%s</body> </html> - """.strip() % (status_code, response, message) + """.strip() % (status_code, response, cgi.escape(message)) body = body.encode("utf8", "replace") if not headers: |