aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3464 from rjt-gupta/url-fixThomas Kriechbaumer2019-09-282-6/+31
|\ | | | | Non ascii characters in url
| * url-fixrjt-gupta2019-02-031-6/+15
| |
| * non ascii fix and testsrjt-gupta2019-02-031-0/+16
| |
* | Merge pull request #3486 from rjt-gupta/unicode-filterThomas Kriechbaumer2019-09-282-0/+46
|\ \ | | | | | | filter unicode fix
| * | filter unicode fixrjt-gupta2019-02-242-0/+46
| |/
* | Merge pull request #3526 from pierlon/feature/allow-hostsThomas Kriechbaumer2019-09-287-17/+91
|\ \ | | | | | | Add --allow_hosts option
| * | Only handle types "allow", "ignore" & "tcp"Pierre Gordon2019-04-191-3/+1
| | |
| * | Verify ignore_hosts & allow_hosts are mutually exclusivePierre Gordon2019-04-192-1/+10
| | |
| * | Add --allow_hosts optionPierre Gordon2019-04-196-15/+82
| | | | | | | | | | | | Closes #3295
* | | Merge pull request #3603 from tomsaleeba/patch-1Thomas Kriechbaumer2019-09-281-0/+25
|\ \ \ | | | | | | | | Transparent proxy on Linux for local originating traffic
| * | | docs: correct command to install mitmproxyTom Saleeba2019-08-011-1/+3
| | | |
| * | | docs: add instructions for transparent proxy on Linux for traffic ↵Tom Saleeba2019-08-011-0/+23
| | | | | | | | | | | | | | | | originating from the mitmproxy host itself
* | | | Merge pull request #3600 from king6cong/masterThomas Kriechbaumer2019-09-281-11/+5
|\ \ \ \ | | | | | | | | | | fix pf.conf on macOS
| * | | | fix pf.conf on macOSking6cong2019-07-301-11/+5
| |/ / /
* | | | Merge pull request #3646 from ahopkins/patch-1Thomas Kriechbaumer2019-09-281-0/+3
|\ \ \ \ | | | | | | | | | | Update concepts-certificates.md
| * | | | Update concepts-certificates.mdAdam Hopkins2019-09-241-0/+3
| | | | | | | | | | | | | | | Update to direct people to using Safari instead of another browser on iOS.
* | | | | Merge pull request #3648 from Eluch/masterThomas Kriechbaumer2019-09-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | ssl_insecure added to option_whitelist because it was missing
| * | | | | ssl_insecure added to option_whitelist because it was missingFerenc soós2019-09-271-1/+1
|/ / / / /
* | | | | Merge pull request #3593 from Jessonsotoventura/tabularMaximilian Hils2019-09-269-25/+496
|\ \ \ \ \ | |/ / / / |/| | | | [RFC] Tabular flow list [Updated]
| * | | | Updated Setup.pyJesson Soto Ventura2019-09-241-1/+1
| | | | | | | | | | | | | | | A comma broke the build
| * | | | Merge branch 'master' into tabularJesson Soto Ventura2019-09-2412-24/+48
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3631 from mhils/lintMaximilian Hils2019-09-056-18/+17
|\ \ \ \ \ | | | | | | | | | | | | Fix CI
| * | | | | lintMaximilian Hils2019-09-056-18/+17
| | | | | |
* | | | | | Merge pull request #3627 from RamiBerm/patch-1Maximilian Hils2019-09-051-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated har_dump,py timings dictionary function
| * | | | | | make dict comprehension more readableMaximilian Hils2019-09-051-1/+4
| | | | | | |
| * | | | | | Updated har_dump,py timings dictionary functionRamiBerm2019-09-031-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-zstandardMaximilian Hils2019-09-056-5/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add support for zstd Content-Encoding
| * | | | | encoding: add support for zstd (zstandard)Tero Saaristo2019-09-056-5/+27
| |/ / / / | | | | | | | | | | | | | | | Handles zstandard-compressed bodies labeled as zstd.
* / / / / lintMaximilian Hils2019-09-051-0/+1
|/ / / /
| * | | Fixed Duration on list viewJesson Soto Ventura2019-09-241-2/+3
| | | | | | | | | | | | | | | | - Set min size to 100 for table view
| * | | TLD and SLD are now highlighted using publicsuffixJesson Soto Ventura2019-09-243-17/+26
| | | | | | | | | | | | | | | | - Added time.time() as the default for the start time on fake requests
| * | | Fixed linting issuesJesson Soto Ventura2019-07-217-17/+17
| | | |
| * | | Added console_flowlist_layout optionJesson Soto Ventura2019-07-215-13/+125
| | | | | | | | | | | | | | | | | | | | | | | | - default - list - table
| * | | Merge branch 'tabular' of github.com:Jessonsotoventura/mitmproxy into tabularJesson Soto Ventura2019-07-211-1/+8
| |\ \ \
| | * | | Added Color palettes for lowlight, lowdark, solarized light, and solarized darkJesson Soto Ventura2019-07-212-6/+67
| | | | |
| * | | | Merge branch 'tabular' of https://github.com/BkPHcgQL3V/mitmproxy into tabularJesson Soto Ventura2019-07-211-1/+2
| |\| | |
| | * | | Tabular list flowBkPHcgQL3V2018-12-194-75/+356
| | | | |
| * | | | Added Color palettes for lowlight, lowdark, solarized light, and solarized darkJesson Soto Ventura2019-07-212-6/+67
| | | | |
| * | | | Tabular list flowBkPHcgQL3V2019-07-214-75/+356
|/ / / /
* | | | Merge pull request #3591 from mhils/miscMaximilian Hils2019-07-191-1/+1
|\ \ \ \ | | | | | | | | | | fix addon deconstruction
| * | | | fix addon deconstructionMaximilian Hils2019-07-181-1/+1
|/ / / /
* | | | Merge pull request #3587 from mhils/yaml-listMaximilian Hils2019-07-181-1/+3
|\ \ \ \ | | | | | | | | | | fix sequence option declaration in yaml files
| * | | | fix sequence option declaration in yaml filesMaximilian Hils2019-07-181-1/+3
| | | | |
* | | | | remove unused dependencyMaximilian Hils2019-07-181-3/+0
| | | | |
* | | | | Merge pull request #3586 from mhils/issue-py38compatMaximilian Hils2019-07-181-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | fix py38 compat
| * | | | fix py38 compatMaximilian Hils2019-07-181-1/+2
|/ / / /
* | | | Merge pull request #3516 from pierlon/remove-confdir-argumentMaximilian Hils2019-07-172-8/+1
|\ \ \ \ | | | | | | | | | | Remove the confdir argument
| * | | | Remove the confdir argumentPierre Gordon2019-04-092-8/+1
| | |/ / | |/| | | | | | | | | | Closes #3266
* | | | Merge pull request #3542 from ZHRhodes/patch-1Maximilian Hils2019-07-171-1/+1
|\ \ \ \ | | | | | | | | | | Typo in howto-wireshark-tls.md
| * | | | Update howto-wireshark-tls.mdZHRhodes2019-05-161-1/+1
| |/ / / | | | | | | | | Fixed a typo in describing the master keys
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 20:32:17 +0000