Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Minor fix re. macOS steps | Lucio Paiva | 2019-06-26 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #3480 from lusceu/master | Maximilian Hils | 2019-04-02 | 2 | -12/+28 | |
|\ \ | | | | | | | Updated exif kaitai files | |||||
| * | | Fixed the exif .ksy files in the kaitai repo. Compiled the .ksy to python ↵ | ls | 2019-02-17 | 2 | -12/+28 | |
| | | | | | | | | | | | | files and updated them in the contrib folder. | |||||
* | | | Merge pull request #3490 from rjt-gupta/rjt-gupta-update-readme | Maximilian Hils | 2019-04-02 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Suggestion: Update Readme to improve testing | |||||
| * | | | simplify testing instructions | Maximilian Hils | 2019-04-02 | 1 | -7/+1 | |
| | | | | ||||||
| * | | | Update README.rst | Rajat Gupta | 2019-02-28 | 1 | -0/+6 | |
| |/ / | ||||||
* | | | Merge pull request #3509 from ohhorob/patch-1 | Samoilenko Roman | 2019-03-30 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Fix markdown typo on addons-scripting.md | |||||
| * | | Fix markdown typo on addons-scripting.md | Rob Wills | 2019-03-29 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3459 from RPigott/wsproto-update | Thomas Kriechbaumer | 2019-01-31 | 2 | -49/+52 | |
|\ \ | | | | | | | Fix: update to wsproto 0.13 for real this time | |||||
| * | | removed whitespace in kwargs | rpigott | 2019-01-31 | 1 | -4/+4 | |
| | | | ||||||
| * | | whitespace error | rpigott | 2019-01-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Separate client and server PerMessageDefalte extension per #3460 | rpigott | 2019-01-30 | 1 | -6/+10 | |
| | | | ||||||
| * | | update to wsproto 0.13 | rpigott | 2019-01-29 | 2 | -45/+44 | |
|/ / | ||||||
* | | Merge pull request #3437 from yan12125/fix-tests-on-mojave | Thomas Kriechbaumer | 2019-01-26 | 1 | -1/+5 | |
|\ \ | | | | | | | Fix a failing test on macOS Mojave | |||||
| * | | Fix a failing test on macOS Mojave | Chih-Hsuan Yen | 2018-12-29 | 1 | -1/+5 | |
| |/ | ||||||
* | | Merge pull request #3441 from petersmythe/patch-1 | Maximilian Hils | 2019-01-23 | 2 | -2/+2 | |
|\ \ | | | | | | | Fix spelling issues | |||||
| * | | Fix space | Peter Smythe | 2019-01-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix spelling | Peter Smythe | 2019-01-03 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #3451 from yjh0502/openbsd-doc | Maximilian Hils | 2019-01-23 | 1 | -1/+1 | |
|\ \ | | | | | | | openbsd: divert-to requires exact listen address | |||||
| * | | openbsd: divert-to requires exact listen address | Jihyun Yu | 2019-01-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | 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`. | |||||
* | | | Merge pull request #3453 from XZzYassin/patch-1 | Maximilian Hils | 2019-01-23 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fixes copying on macos | |||||
| * | | | fixes copying on macos | Mumen Yassin | 2019-01-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | remove travis workaround | Thomas Kriechbaumer | 2019-01-18 | 1 | -1/+0 | |
| | | | ||||||
* | | | remove sudo:false flag | Thomas Kriechbaumer | 2019-01-18 | 1 | -1/+0 | |
|/ / | | | | | https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration | |||||
* | | Merge pull request #3444 from BoboTiG/fix-resource-leaks | Maximilian Hils | 2019-01-06 | 5 | -9/+12 | |
|\ \ | | | | | | | Fix ResourceWarning: unclosed file, prevent resource leaks | |||||
| * | | Fix ResourceWarning: unclosed file, prevent resource leaks | Mickaël Schoentgen | 2019-01-06 | 5 | -9/+12 | |
| |/ | | | | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | |||||
* | | Merge pull request #3443 from BoboTiG/fix-invalid-seq-warnings | Maximilian Hils | 2019-01-06 | 14 | -20/+20 | |
|\ \ | |/ |/| | Fix several DeprecationWarning: invalid escape sequence | |||||
| * | Fix several DeprecationWarning: invalid escape sequence | Mickaël Schoentgen | 2019-01-05 | 14 | -20/+20 | |
|/ | | | | Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> | |||||
* | Fix Flow being part of raw_format_flow cache key | BkPHcgQL3V | 2018-12-17 | 1 | -5/+5 | |
| | | | | | | | | | | raw_format_flow is annotated with the @lru_cache decorator, which creates a cache of the function's return value based on its parameters. Thus, assuming that the first argument (f) contains all the information needed to compute the urwid control for the flow, this effectively caches results. To make most use of this, remove the second parameter representing the real Flow object to improve @lru_cache's efficiency. | |||||
* | charset in meta tags (#3411) | Rajat Gupta | 2018-12-13 | 2 | -16/+30 | |
| | | | original contribution from @0xHJK in https://github.com/mitmproxy/mitmproxy/pull/3150 | |||||
* | fix query array | Rajat Gupta | 2018-12-03 | 5 | -13/+47 | |
| | | | | fixes #3072 closes #3254 | |||||
* | Merge pull request #3403 from Kriechi/bump-deps | Thomas Kriechbaumer | 2018-12-02 | 16 | -27/+30 | |
|\ | | | | | bump dependencies | |||||
| * | bump dependencies | Thomas Kriechbaumer | 2018-12-02 | 16 | -27/+30 | |
|/ | ||||||
* | Merge pull request #3401 from rjt-gupta/fix-replay-timestamps | Thomas Kriechbaumer | 2018-12-01 | 1 | -0/+2 | |
|\ | | | | | client-replay-fix | |||||
| * | client-replay-fix | rjt-gupta | 2018-12-01 | 1 | -0/+2 | |
|/ | ||||||
* | Merge pull request #3382 from abhigyank/org | Thomas Kriechbaumer | 2018-11-12 | 3 | -21/+21 | |
|\ | | | | | Change variable o to organization for generated certficates. | |||||
| * | Change variable o to organization for generated certficates. | Abhigyan Khaund | 2018-11-11 | 3 | -21/+21 | |
|/ | ||||||
* | Add Organization field for the generated certificate (#3376) | Abcdefghijklmnopqrstuvwxyzxyz | 2018-11-09 | 3 | -6/+28 | |
| | | | add organization field for the generated certificate | |||||
* | Merge pull request #3371 from JessicaFavin/proper-display-on-stderr | Maximilian Hils | 2018-11-09 | 2 | -11/+41 | |
|\ | | | | | Display errors on sys.stderr | |||||
| * | Remove indent on echo_error | JessicaFavin | 2018-11-04 | 1 | -3/+1 | |
| | | ||||||
| * | test_dumper.py - Add sio_err everywhere + adjust test_simple | Jessica Favin | 2018-11-04 | 1 | -4/+26 | |
| | | ||||||
| * | Fix test_dumper.py - Dumper constructor | Jessica Favin | 2018-11-04 | 1 | -2/+2 | |
| | | ||||||
| * | Update test_dumper.py | Jessica Favin | 2018-11-04 | 1 | -2/+4 | |
| | | ||||||
| * | Display errors on sys.stderr | Jessica Favin | 2018-11-01 | 1 | -3/+11 | |
| | | ||||||
* | | Merge pull request #3374 from abhigyank/docs | Maximilian Hils | 2018-11-09 | 1 | -1/+1 | |
|\ \ | |/ |/| | docs: Add mitm.it link in the certificates docs. | |||||
| * | docs: don't make links extra bold | Maximilian Hils | 2018-11-09 | 1 | -1/+1 | |
| | | ||||||
| * | docs: Add mitm.it link in the certificates docs. | Abhigyan Khaund | 2018-11-05 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #3366 from alexlauerman/patch-3 | Maximilian Hils | 2018-10-26 | 1 | -1/+1 | |
|\ | | | | | Corrected keep_host_header usage option | |||||
| * | Corrected keep_host_header usage option | Alex Lauerman | 2018-10-25 | 1 | -1/+1 | |
|/ | | | I tested this locally to verify this change is correct. | |||||
* | Merge pull request #3356 from fghzxm/umask-keys | Samoilenko Roman | 2018-10-25 | 2 | -2/+27 | |
|\ | | | | | Make private keys readable only by the owner |