aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/message.py
diff options
context:
space:
mode:
authorClemens <cle1000.cb@gmail.com>2016-08-09 19:49:36 +0200
committerClemens <cle1000.cb@gmail.com>2016-08-09 19:49:36 +0200
commitb27e456ce2150d638b4eef73703da8a30722d392 (patch)
tree2ba82b15f1bdf22f12b7d97e726dcbd19374e9cf /netlib/http/message.py
parent78bd99f97c36ba24bbab389350eb8e80ba16738f (diff)
parentdcfa7027aed5a8d4aa80aff67fc299298659fb1b (diff)
downloadmitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.gz
mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.tar.bz2
mitmproxy-b27e456ce2150d638b4eef73703da8a30722d392.zip
merge with master
Diffstat (limited to 'netlib/http/message.py')
-rw-r--r--netlib/http/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/http/message.py b/netlib/http/message.py
index be35b8d1..ce92bab1 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -248,7 +248,7 @@ class Message(basetypes.Serializable):
def encode(self, e):
"""
- Encodes body with the encoding e, where e is "gzip", "deflate" or "identity".
+ Encodes body with the encoding e, where e is "gzip", "deflate", "identity", or "br".
Any existing content-encodings are overwritten,
the content is not decoded beforehand.