Merge pull request #2790 from gpotter2/brotli-a

Pin brotli version
secdev · Sep 2, 2020 · 95ba5b8 · 95ba5b8
2 parents a786307 + df769a3
commit 95ba5b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/test/regression.uts b/test/regression.uts
@@ -7688,6 +7688,7 @@ assert HTTPResponse in pkts[2]
 assert pkts[2].load == b'<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html><head><title></title></head><body style="background-color: transparent"><img src=\'https://pixel.mathtag.com/event/img?mt_id=151466&mt_adid=106144&v1=&v2=&v3=&s1=&s2=&s3=&ord=2047279765\' width=\'1\' height=\'1\' /><img src="https://adservice.google.com/ddm/fls/z/src=3656617;type=hpvisit;cat=homep198;u2=;u6=;u5=;u4=;u3=;u9=;u10=;u7=;u13=;u14=;u11=;u17=;u18=unknown;u20=;ord=1956603866265.9536"/></body></html>'
 
 = HTTP decompression (brotli)
+~ brotli
 
 conf.debug_dissector = True
 load_layer("http")

diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ deps = mock
        cryptography
        coverage
        python-can
-       brotli
+       brotli<1.0.8
 platform =
   linux_non_root,linux_root: linux
   bsd_non_root,bsd_root: darwin|freebsd|openbsd|netbsd