tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow already encoded answers

Browse Source
This commit is contained in:
Unrud 2017-05-07 08:17:35 +02:00
parent bc49542a62
commit f1a9cf7694
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radicale/__init__.py
View File

@ -289,8 +289,10 @@ class Application:
headers = dict(headers) headers = dict(headers)
# Set content length # Set content length
if answer: if answer:
self.logger.debug("Response content:\n%s", answer) if hasattr(answer, "encode"):
answer = answer.encode(self.encoding) self.logger.debug("Response content:\n%s", answer)
headers["Content-Type"] += "; charset=%s" % self.encoding
answer = answer.encode(self.encoding)
accept_encoding = [ accept_encoding = [
encoding.strip() for encoding in encoding.strip() for encoding in
environ.get("HTTP_ACCEPT_ENCODING", "").split(",") environ.get("HTTP_ACCEPT_ENCODING", "").split(",")
@ -302,7 +304,6 @@ class Application:
headers["Content-Encoding"] = "gzip" headers["Content-Encoding"] = "gzip"
headers["Content-Length"] = str(len(answer)) headers["Content-Length"] = str(len(answer))
headers["Content-Type"] += "; charset=%s" % self.encoding
# Add extra headers set in configuration # Add extra headers set in configuration
if self.configuration.has_section("headers"): if self.configuration.has_section("headers"):