| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3659 from vin01/master | Maximilian Hils | 2019-10-04 | 1 | -0/+7 |
| |\ | | | | | Add EKU extension for dummy certificates | ||||
| | * | Add EKU extension for dummy certificates | vin01 | 2019-10-03 | 1 | -0/+7 |
| |/ | |||||
| * | Add key_size option to define rsa key size (#3657) | vin01 | 2019-09-30 | 6 | -18/+30 |
| | | |||||
| * | Update howto-transparent-vms.md for newer versions (#3597) | Nirusu | 2019-09-30 | 1 | -4/+10 |
| | | | | Update howto-transparent-vms.md for newer versions | ||||
| * | Merge pull request #3655 from Kriechi/bump | Thomas Kriechbaumer | 2019-09-28 | 4 | -20/+19 |
| |\ | | | | | bump more deps | ||||
| | * | bump more deps | Thomas Kriechbaumer | 2019-09-28 | 4 | -20/+19 |
| |/ | |||||
| * | Merge pull request #3653 from Kriechi/bump-yaml | Thomas Kriechbaumer | 2019-09-28 | 6 | -12/+12 |
| |\ | | | | | bump deps | ||||
| | * | bump deps | Thomas Kriechbaumer | 2019-09-28 | 6 | -12/+12 |
| |/ | |||||
| * | Merge pull request #3329 from Kriechi/readme-slogan | Thomas Kriechbaumer | 2019-09-28 | 4 | -10/+11 |
| |\ | | | | | update readme slogan | ||||
| | * | update readme slogan | Thomas Kriechbaumer | 2018-09-21 | 4 | -10/+11 |
| | | | |||||
| * | | Merge pull request #3651 from Kriechi/bump-deps | Thomas Kriechbaumer | 2019-09-28 | 4 | -11/+12 |
| |\ \ | | | | | | | bump dependencies | ||||
| | * | | bump dependencies | Thomas Kriechbaumer | 2019-09-28 | 4 | -11/+12 |
| |/ / | |||||
| * | | Merge pull request #3560 from travelperk/add-refresh-option | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+1 |
| |\ \ | | | | | | | Add refresh option to disable cookies | ||||
| | * | | Add refresh option to disable cookies | Javier Tejero | 2019-06-05 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #3594 from Jessonsotoventura/open_editor | Thomas Kriechbaumer | 2019-09-28 | 1 | -1/+6 |
| |\ \ \ | | | | | | | | | Edit URLs in external editor | ||||
| | * | | | Edit URL now opens the external editor | Jesson Soto Ventura | 2019-07-22 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Merge pull request #3650 from Kriechi/fix-linting | Thomas Kriechbaumer | 2019-09-28 | 2 | -2/+1 |
| |\ \ \ \ | | | | | | | | | | | fix linting | ||||
| | * | | | | fix linting | Thomas Kriechbaumer | 2019-09-28 | 2 | -2/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #3464 from rjt-gupta/url-fix | Thomas Kriechbaumer | 2019-09-28 | 2 | -6/+31 |
| |\ \ \ \ | | | | | | | | | | | Non ascii characters in url | ||||
| | * | | | | url-fix | rjt-gupta | 2019-02-03 | 1 | -6/+15 |
| | | | | | | |||||
| | * | | | | non ascii fix and tests | rjt-gupta | 2019-02-03 | 1 | -0/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #3486 from rjt-gupta/unicode-filter | Thomas Kriechbaumer | 2019-09-28 | 2 | -0/+46 |
| |\ \ \ \ \ | | | | | | | | | | | | | filter unicode fix | ||||
| | * | | | | | filter unicode fix | rjt-gupta | 2019-02-24 | 2 | -0/+46 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3526 from pierlon/feature/allow-hosts | Thomas Kriechbaumer | 2019-09-28 | 7 | -17/+91 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add --allow_hosts option | ||||
| | * | | | | | Only handle types "allow", "ignore" & "tcp" | Pierre Gordon | 2019-04-19 | 1 | -3/+1 |
| | | | | | | | |||||
| | * | | | | | Verify ignore_hosts & allow_hosts are mutually exclusive | Pierre Gordon | 2019-04-19 | 2 | -1/+10 |
| | | | | | | | |||||
| | * | | | | | Add --allow_hosts option | Pierre Gordon | 2019-04-19 | 6 | -15/+82 |
| | | |_|/ / | |/| | | | | | | | | | | | | | Closes #3295 | ||||
| * | | | | | Merge pull request #3603 from tomsaleeba/patch-1 | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | Transparent proxy on Linux for local originating traffic | ||||
| | * | | | | | docs: correct command to install mitmproxy | Tom Saleeba | 2019-08-01 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | docs: add instructions for transparent proxy on Linux for traffic ↵ | Tom Saleeba | 2019-08-01 | 1 | -0/+23 |
| | | |_|/ / | |/| | | | | | | | | | | | | | originating from the mitmproxy host itself | ||||
| * | | | | | Merge pull request #3600 from king6cong/master | Thomas Kriechbaumer | 2019-09-28 | 1 | -11/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix pf.conf on macOS | ||||
| | * | | | | | fix pf.conf on macOS | king6cong | 2019-07-30 | 1 | -11/+5 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3646 from ahopkins/patch-1 | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | Update concepts-certificates.md | ||||
| | * | | | | | Update concepts-certificates.md | Adam Hopkins | 2019-09-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | Update to direct people to using Safari instead of another browser on iOS. | ||||
| * | | | | | | Merge pull request #3648 from Eluch/master | Thomas Kriechbaumer | 2019-09-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | ssl_insecure added to option_whitelist because it was missing | ||||
| | * | | | | | | ssl_insecure added to option_whitelist because it was missing | Ferenc soós | 2019-09-27 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #3593 from Jessonsotoventura/tabular | Maximilian Hils | 2019-09-26 | 9 | -25/+496 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | [RFC] Tabular flow list [Updated] | ||||
| | * | | | | | Updated Setup.py | Jesson Soto Ventura | 2019-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | A comma broke the build | ||||
| | * | | | | | Merge branch 'master' into tabular | Jesson Soto Ventura | 2019-09-24 | 12 | -24/+48 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #3631 from mhils/lint | Maximilian Hils | 2019-09-05 | 6 | -18/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix CI | ||||
| | * | | | | | | lint | Maximilian Hils | 2019-09-05 | 6 | -18/+17 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3627 from RamiBerm/patch-1 | Maximilian Hils | 2019-09-05 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updated har_dump,py timings dictionary function | ||||
| | * | | | | | | | make dict comprehension more readable | Maximilian Hils | 2019-09-05 | 1 | -1/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Updated har_dump,py timings dictionary function | RamiBerm | 2019-09-03 | 1 | -1/+1 |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the HAR file spec (http://www.softwareishard.com/blog/har-12-spec/#timings) states that timings that do not apply for a certain requests should be set to -1, this example may set -1000 as a timings value for certain requests. This ends up producing invalid HAR files in many cases. My proposed fix is to assign -1 into the dic and only multiply by 1000 for other values | ||||
| * | | | | | | | Merge pull request #3630 from tsaaristo/encode-zstandard | Maximilian Hils | 2019-09-05 | 6 | -5/+27 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add support for zstd Content-Encoding | ||||
| | * | | | | | | encoding: add support for zstd (zstandard) | Tero Saaristo | 2019-09-05 | 6 | -5/+27 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Handles zstandard-compressed bodies labeled as zstd. | ||||
| * / / / / / | lint | Maximilian Hils | 2019-09-05 | 1 | -0/+1 |
| |/ / / / / | |||||
| | * | | | | Fixed Duration on list view | Jesson Soto Ventura | 2019-09-24 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | - Set min size to 100 for table view | ||||
| | * | | | | TLD and SLD are now highlighted using publicsuffix | Jesson Soto Ventura | 2019-09-24 | 3 | -17/+26 |
| | | | | | | | | | | | | | | | | | | | | | - Added time.time() as the default for the start time on fake requests | ||||
| | * | | | | Fixed linting issues | Jesson Soto Ventura | 2019-07-21 | 7 | -17/+17 |
| | | | | | | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |