Commit Graph

8141 Commits

Author SHA1 Message Date
Maximilian Hils
256c0c94fb
Merge pull request #3586 from mhils/issue-py38compat
fix py38 compat
2019-07-18 03:13:50 +02:00
Maximilian Hils
2236b52816 fix sequence option declaration in yaml files 2019-07-18 02:54:43 +02:00
Maximilian Hils
b86cf6dea9 fix py38 compat 2019-07-18 02:52:24 +02:00
Maximilian Hils
2e30c4073d
Merge pull request #3516 from pierlon/remove-confdir-argument
Remove the confdir argument
2019-07-17 23:59:40 +02:00
Maximilian Hils
d64ec3072d
Merge pull request #3542 from ZHRhodes/patch-1
Typo in howto-wireshark-tls.md
2019-07-17 22:49:37 +02:00
Maximilian Hils
5bcbbf9aeb
Merge pull request #3547 from felixonmars/brotli
Use Brotli instead of brotlipy
2019-07-17 22:49:08 +02:00
Maximilian Hils
3eebfed79f
Update serverplayback.py 2019-07-17 22:46:39 +02:00
Maximilian Hils
69a3f77256
Merge pull request #3525 from tonyb486/bugfix-dateheader
Fix #3502 by using email.utils.formatdate's usegmt argument.
2019-07-17 22:43:14 +02:00
Maximilian Hils
386772f8fc
Merge pull request #3580 from MathieuBordere/mathieu/3567-ReplaceMasker
websockets: replace masker with more optimized one
2019-07-17 22:38:49 +02:00
Maximilian Hils
0e096137d5 update pyinstaller 2019-07-17 22:24:38 +02:00
Mathieu Borderé
102e64bda5 websockets: replace masker with more optimized one 2019-07-06 14:51:40 +02:00
Thomas Kriechbaumer
b5404f82da
Merge pull request #3570 from luciopaiva/patch-1
Doc fix regarding transparent proxy on macOS
2019-07-03 20:45:29 +02:00
Lucio Paiva
a4f8457dd3
Minor fix re. macOS steps 2019-06-26 18:39:23 +01:00
Javier Tejero
e63a099fcc
Add refresh option to disable cookies 2019-06-05 14:27:06 +02:00
Felix Yan
2fef56767b
Use Brotli instead of brotlipy
brotlipy is stuck at brotli 0.6 and upstream is inactive. Let's switch
to the official binding which is up-to-date and has same interfaces.
2019-05-27 16:10:18 +08:00
ZHRhodes
1410bdd9ca
Update howto-wireshark-tls.md
Fixed a typo in describing the master keys
2019-05-16 23:21:47 -07:00
Pierre Gordon
bcbf76a628 Only handle types "allow", "ignore" & "tcp" 2019-04-19 13:43:12 -05:00
Pierre Gordon
1b3f86e709 Verify ignore_hosts & allow_hosts are mutually exclusive 2019-04-19 13:10:39 -05:00
Pierre Gordon
8d0c800d15 Add --allow_hosts option
Closes #3295
2019-04-19 12:39:53 -05:00
Anthony Biondo
a8489466c1 update formatdate for cookies and tests to use GMT formatting 2019-04-16 22:11:27 -04:00
Anthony Biondo
bcd1bb23f6 Fix #3502 by using email.utils.formatdate's usegmt argument. 2019-04-16 21:53:31 -04:00
peter-way
141ade5ae1 Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in transparent mode. 2019-04-15 08:43:52 +08:00
Pierre Gordon
13ad81eaff Remove the confdir argument
Closes #3266
2019-04-09 15:23:07 -05:00
Maximilian Hils
8353f4a55a
Merge pull request #3480 from lusceu/master
Updated exif kaitai files
2019-04-02 16:39:16 +02:00
Maximilian Hils
cbca131002
Merge pull request #3490 from rjt-gupta/rjt-gupta-update-readme
Suggestion: Update Readme to improve testing
2019-04-02 16:29:39 +02:00
Maximilian Hils
6eb47a5fa5
simplify testing instructions 2019-04-02 16:29:14 +02:00
Samoilenko Roman
035c6ca2d5
Merge pull request #3509 from ohhorob/patch-1
Fix markdown typo on addons-scripting.md
2019-03-30 11:51:33 +02:00
Rob Wills
fad326a85f
Fix markdown typo on addons-scripting.md 2019-03-29 15:11:17 -07:00
Rajat Gupta
9b7c2566d3
Update README.rst 2019-02-28 23:59:50 +05:30
rjt-gupta
6e153b2c01 filter unicode fix 2019-02-24 01:45:45 +05:30
ls
0d108fac86 Fixed the exif .ksy files in the kaitai repo. Compiled the .ksy to python files and updated them in the contrib folder. 2019-02-17 23:26:20 +01:00
rjt-gupta
ba054b15f3 url-fix 2019-02-03 00:53:05 +05:30
rjt-gupta
cec8c67465 non ascii fix and tests 2019-02-03 00:49:53 +05:30
Thomas Kriechbaumer
70777a1b6e
Merge pull request #3459 from RPigott/wsproto-update
Fix: update to wsproto 0.13 for real this time
2019-01-31 22:08:02 +01:00
rpigott
7fa209790e removed whitespace in kwargs 2019-01-31 12:34:00 -08:00
rpigott
92fc87bc4c whitespace error 2019-01-30 23:44:35 -08:00
rpigott
2af71a4486 Separate client and server PerMessageDefalte extension per #3460 2019-01-30 18:31:44 -08:00
rpigott
106948d996 update to wsproto 0.13 2019-01-29 12:09:05 -08:00
Thomas Kriechbaumer
67aa1b63f9
Merge pull request #3437 from yan12125/fix-tests-on-mojave
Fix a failing test on macOS Mojave
2019-01-26 14:57:41 +01:00
Maximilian Hils
139a385900
Merge pull request #3441 from petersmythe/patch-1
Fix spelling issues
2019-01-23 13:08:51 +01:00
Maximilian Hils
79b9e0d1bf
Merge pull request #3451 from yjh0502/openbsd-doc
openbsd: divert-to requires exact listen address
2019-01-23 13:08:25 +01:00
Maximilian Hils
5ad12e625b
Merge pull request #3453 from XZzYassin/patch-1
fixes copying on macos
2019-01-23 13:07:40 +01:00
Mumen Yassin
995d9f0f49
fixes copying on macos 2019-01-23 14:34:55 +03:00
Thomas Kriechbaumer
8b9583f19d
remove travis workaround 2019-01-18 19:52:24 +01:00
Thomas Kriechbaumer
63a5e1d3ae
remove sudo:false flag
https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
2019-01-18 19:47:45 +01:00
Jihyun Yu
c331ba91fc openbsd: divert-to requires exact listen address
divert-to does not work with '0.0.0.0' or similar listen address, so we
need to specify listen address that we provided to `pf`.
2019-01-18 15:59:58 +09:00
rjt-gupta
1ee54f7d73 option added 2019-01-07 23:17:11 +05:30
Maximilian Hils
82bc8c7ca2
Merge pull request #3444 from BoboTiG/fix-resource-leaks
Fix ResourceWarning: unclosed file, prevent resource leaks
2019-01-06 17:43:47 +01:00
Mickaël Schoentgen
c03b07930c Fix ResourceWarning: unclosed file, prevent resource leaks
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
2019-01-06 15:06:30 +01:00
Maximilian Hils
4f270b5506
Merge pull request #3443 from BoboTiG/fix-invalid-seq-warnings
Fix several DeprecationWarning: invalid escape sequence
2019-01-06 14:19:45 +01:00