diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-30 15:56:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 15:56:15 -0700 |
| commit | f008bdf5901563923d25c1bba4109efba8d444f3 (patch) | |
| tree | 499f73d0db9813e4a1e62dd9c0ce9481a4c85998 /netlib/http | |
| parent | 47f0c2141763385980a483b97dc403b582aa2127 (diff) | |
| parent | 6792ec40587bde8dbd7fac67c35038afc126e80b (diff) | |
| download | mitmproxy-f008bdf5901563923d25c1bba4109efba8d444f3.tar.gz mitmproxy-f008bdf5901563923d25c1bba4109efba8d444f3.tar.bz2 mitmproxy-f008bdf5901563923d25c1bba4109efba8d444f3.zip | |
Merge pull request #1451 from YanchWare/master
Integrated encode/decoder for brotli
Diffstat (limited to 'netlib/http')
| -rw-r--r-- | netlib/http/message.py | 2 | ||||
| -rw-r--r-- | netlib/http/request.py | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/netlib/http/request.py b/netlib/http/request.py index 061217a3..d59fead4 100644 --- a/netlib/http/request.py +++ b/netlib/http/request.py @@ -337,7 +337,7 @@ class Request(message.Message): self.headers["accept-encoding"] = ( ', '.join( e - for e in {"gzip", "identity", "deflate"} + for e in {"gzip", "identity", "deflate", "br"} if e in accept_encoding ) ) |