aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Collapse)AuthorAgeFilesLines
* Closes #1580 Gives warning when explicit proxy configured in transparent ↵Ujjwal Verma2017-02-091-4/+11
| | | | mode (#1996)
* Merge pull request #2003 from Kriechi/coverage++Maximilian Hils2017-02-0914-96/+81
|\ | | | | test refactoring and coverage++
| * minor changesThomas Kriechbaumer2017-02-092-2/+2
| |
| * eventsequence: coverage++Thomas Kriechbaumer2017-02-095-12/+12
| |
| * websockets, tcp, version: coverage++Thomas Kriechbaumer2017-02-096-59/+65
| |
| * remove FIXMEThomas Kriechbaumer2017-02-091-4/+3
| |
| * remove verified remarkThomas Kriechbaumer2017-02-091-1/+0
| |
| * simplify state copyMaximilian Hils2017-02-092-21/+2
| |
* | Merge pull request #1998 from mhils/fix-change-upstreamMaximilian Hils2017-02-091-2/+10
|\ \ | |/ |/| Fix change_upstream_proxy_server
| * fix change_upstream_proxy_serverMaximilian Hils2017-02-091-2/+10
| |
* | Merge pull request #1997 from s4chin/add-gif-parserMaximilian Hils2017-02-083-1/+281
|\ \ | | | | | | Add gif parser and tests
| * | Fix gif parsing error on some gifs and add testSachin Kelkar2017-02-081-12/+18
| | |
| * | Add gif parser and testsSachin Kelkar2017-02-063-1/+275
| |/
* / Encoding fixes and testsUjjwal Verma2017-02-051-14/+17
|/
* Merge pull request #1989 from Kriechi/coverage++Maximilian Hils2017-02-042-17/+0
|\ | | | | coverage++
| * coverage++Thomas Kriechbaumer2017-02-042-17/+0
| |
* | Merge pull request #1988 from krsoninikhil/ordereddictMaximilian Hils2017-02-041-1/+1
|\ \ | |/ |/| Closes #1977
| * Changes view._store from dict to OrderedDictNikhil Soni2017-02-041-1/+1
| |
* | Merge pull request #1967 from s4chin/remove-pillowMaximilian Hils2017-02-034-1/+329
|\ \ | | | | | | Add png parser
| * | FeedbackSachin Kelkar2017-02-033-5/+7
| | |
| * | Fix and cleanupSachin Kelkar2017-02-032-10/+12
| | |
| * | Add iTXt and zTXt testsSachin Kelkar2017-02-032-1/+37
| | |
| * | Fix as per feedback and add more testsSachin Kelkar2017-02-034-32/+20
| | |
| * | Add png parserSachin Kelkar2017-02-035-4/+304
| | |
* | | Merge pull request #1983 from Kriechi/coverage++Maximilian Hils2017-02-031-1/+1
|\ \ \ | |_|/ |/| | coverage++
| * | coverage++Thomas Kriechbaumer2017-02-031-1/+1
| |/
* / Closes #1960 'Z' removes unmarked flowsUjjwal Verma2017-02-032-0/+14
|/
* fix mergeThomas Kriechbaumer2017-02-021-5/+6
|
* Merge pull request #1979 from 0neblock/masterMaximilian Hils2017-02-021-1/+1
|\ | | | | Fixed following on flowlist
| * Fixed following on flowlistAidan Cyr2017-02-021-1/+1
| | | | | | Fixed a focus_follow was missed when options were cleaned up.
* | replace tutils.raises with pytest.raises + shimThomas Kriechbaumer2017-02-021-59/+0
| |
* | cleanup test utilsThomas Kriechbaumer2017-02-022-7/+27
|/
* increase test coverageThomas Kriechbaumer2017-02-024-10/+12
|
* fix linting errorThomas Kriechbaumer2017-02-021-1/+0
|
* Add except clause to catch script parsing errors (#1929)lymanZerga112017-02-012-7/+13
|
* Regularise setheaders optionsAldo Cortesi2017-02-014-67/+56
| | | | | | | | As per replacements: - Make the option type a string/tuple union - Localise parsing strictly within the addon - Adapt the console editor (we'll find a more elegant solution later)
* Revamp replacement hooksAldo Cortesi2017-02-015-66/+85
| | | | | | | | | | | | | | - Replacement specifiers can be either strings or tuples. This lets us cope gracefully with command-line parsing (and posible quick interactive specification) without having to special-case replacement hooks, or have knowledge of hook specification leak outside the addon. We can also now use the same command-line spec format in config files. - Split replacement and replacement from file into separate addons and options. Files are now read on each replacement, so you can edit replacement files in place without restart. - Modernise the test suite to use addon test helpers. TODO: editing and displaying replace-from-file in console app
* Merge pull request #1965 from cortesi/optnameAldo Cortesi2017-02-0112-164/+174
|\ | | | | Consolidate option names
| * Consolidate option namesAldo Cortesi2017-01-3012-164/+174
| | | | | | | | | | | | - Onboarding app options to onboarding* - Console-specific options to console_* - Web-specific options to web_*
* | :see_no_evil:Maximilian Hils2017-01-301-0/+2
|/
* simplify termlog outfile handlingThomas Kriechbaumer2017-01-251-9/+6
|
* write errors to stderr (#1952)nish212017-01-251-0/+8
|
* Merge pull request #1956 from Kriechi/version-stringThomas Kriechbaumer2017-01-231-1/+15
|\ | | | | improve version specifiers
| * improve version specifiersThomas Kriechbaumer2017-01-231-1/+15
| |
* | Merge pull request #1945 from Kriechi/ca-expiredMaximilian Hils2017-01-237-39/+68
|\ \ | | | | | | fix #939
| * | fix #939Thomas Kriechbaumer2017-01-237-39/+68
| |/
* | test disable_h2c_upgrade addonThomas Kriechbaumer2017-01-231-0/+1
| |
* | test websocket addonThomas Kriechbaumer2017-01-231-0/+55
|/
* Merge pull request #1940 from s4chin/add-marked-filterMaximilian Hils2017-01-201-0/+1
|\ | | | | web: Add ~marked filter
| * web: Add ~marked filterSachin Kelkar2017-01-201-0/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:02:43 +0000