aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #2733 from mitmproxy/pyinstallerMaximilian Hils2017-12-3011-118/+165
|\ \ \ \ | | | | | | | | | | Update PyInstaller, add dev version info to builds.
| * | | | update installbuilderMaximilian Hils2017-12-301-1/+1
| | | | |
| * | | | fix #2470Maximilian Hils2017-12-301-2/+3
| | | | |
| * | | | fix appveyor build scriptMaximilian Hils2017-12-303-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | we now have a module named "types", which of course confuses Python 3.5. O:-)
| * | | | single-source version processingMaximilian Hils2017-12-306-67/+95
| | | | |
| * | | | rtool: include dev version in binariesMaximilian Hils2017-12-294-37/+77
| | | | |
| * | | | tox.ini: python3 -> pythonMaximilian Hils2017-12-291-2/+2
| | | | | | | | | | | | | | | | | | | | "python3" points to a different binary... on Windows, at least.
| * | | | remove rtool's setup.py, embrace toxMaximilian Hils2017-12-292-23/+3
| | | | |
| * | | | update rtool dependenciesMaximilian Hils2017-12-261-1/+1
| | | | |
| * | | | make sure that mitmproxy/rtool dependencies don't clashMaximilian Hils2017-12-261-0/+1
| | | | |
| * | | | update pyinstaller :pray:Maximilian Hils2017-12-261-2/+1
| | | | |
* | | | | Merge pull request #2703 from mhils/test-defaultkeysMaximilian Hils2017-12-302-6/+33
|\ \ \ \ \ | |_|/ / / |/| | | | Test that default key bindings are valid commands
| * | | | test that defaultkeys are valid commandsMaximilian Hils2017-12-292-6/+33
| |/ / /
* | | | Merge pull request #2732 from mitmproxy/websocket-flow-killMaximilian Hils2017-12-294-16/+32
|\ \ \ \ | | | | | | | | | | fix flow.kill
| * | | | fix Flow.kill behaviourMaximilian Hils2017-12-294-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now just sets a kill reply instead of committing directly. First, this seems like the more sane thing to do. Second, we have an iffy race condition where we call Reply.commit() before the addonmanager finishes its invocation, the proxy thread then progresses and sets a new flow.reply attribute, and the addonmanager then gets confused when finishing. This commit doesn't fix that, but mitigates it for Flow.kill which is now committed by the addonmanager.
| * | | | websocket: add flow kill testThomas Kriechbaumer2017-12-291-0/+19
|/ / / /
* | | | Merge pull request #2728 from Kriechi/websocket++Thomas Kriechbaumer2017-12-295-15/+68
|\ \ \ \ | | | | | | | | | | websocket: docs++ and kill messages
| * | | | websocket: test killableThomas Kriechbaumer2017-12-281-0/+15
| | | | |
| * | | | websocket: docs++ and kill messagesThomas Kriechbaumer2017-12-275-15/+53
|/ / / / | | | | | | | | | | | | fixes #2724
* / / / Display "*" when listening on all interfacesMaximilian Hils2017-12-262-0/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The set of people who understand "0.0.0.0" (and/or "::") is a subset of the set of people who understand "*", so we can make things easier to understand by using the less technical notation. Empirical Evidence: - https://discourse.mitmproxy.org/t/unable-to-use-mitmproxy-on-windows/735 - https://discourse.mitmproxy.org/t/how-to-view-the-proxy-servers-url/23
* | | @concurrent decorator works for class methods. (#2708)fate02017-12-262-8/+10
| | | | | | | | | | | | | | | * @concurrent decorator should works for class methods * modify test for @concurrent decorator in class. * add docs
* | | cleanup transparent linux docsThomas Kriechbaumer2017-12-211-26/+8
| | |
* | | Update linux.rstJim Higson2017-12-211-2/+22
| | |
* | | Merge pull request #2710 from jimhigson/update-ios-instructionsThomas Kriechbaumer2017-12-211-5/+5
|\ \ \ | | | | | | | | Move trust instructions for ios
| * | | minor docs improvementsMaximilian Hils2017-12-181-6/+3
| | | | | | | | | | | | | | | | 1. The way the certificate is installed (mitm.it or not) does not matter. 2. Instructions are a bit shorter now and match those provided by Apple at https://support.apple.com/en-us/HT204477.
| * | | move extra info for ios to ios sectionjimhigson2017-12-181-5/+8
| | | |
* | | | Merge pull request #2716 from cortesi/cmdfixesAldo Cortesi2017-12-208-3/+49
|\ \ \ \ | | | | | | | | | | various command-related fixes
| * | | | cuts: don't crash when retrieving header of a non-existent responseAldo Cortesi2017-12-202-0/+7
| | | | |
| * | | | console: ignore non-nav keys in chooserAldo Cortesi2017-12-202-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Awkward, but works Fixes #2417
| * | | | console options: retain focus position after editAldo Cortesi2017-12-201-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes #2622
| * | | | "Commands" title -> "Command Reference"Aldo Cortesi2017-12-201-1/+1
| | | | |
| * | | | commands: don't try to view flow returns as dataAldo Cortesi2017-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes #2704
| * | | | console: add console.bodyview.optionsAldo Cortesi2017-12-201-0/+8
| | | | | | | | | | | | | | | | | | | | This may be "request" or "response".
* | | | | Merge pull request #2715 from cortesi/fancycommander2Aldo Cortesi2017-12-206-7/+144
|\| | | | | | | | | | | | | | commander: palette entries, highlight errors
| * | | | commander: command argument underlayAldo Cortesi2017-12-203-3/+90
| | | | | | | | | | | | | | | | | | | | Display context-sensitive argument types as an "underlay" in commander.
| * | | | commander: palette entries, highlight errorsAldo Cortesi2017-12-206-6/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add palette entries specific to commander - Highlight errors - Introduce an Unknown type to keep track of extra unknown arguments to commands
* | | | | Merge pull request #2714 from cortesi/commander1Aldo Cortesi2017-12-206-85/+105
|\| | | | | | | | | | | | | | commander: highlight commands
| * | | | commander: highlight commandsAldo Cortesi2017-12-205-29/+55
| | | | | | | | | | | | | | | | | | | | Step 1 of the fancification of commander.
| * | | | commands: partial parser now returns help for remaining argumentsAldo Cortesi2017-12-195-61/+55
| | | | |
* | | | | Merge pull request #2712 from cortesi/types3Aldo Cortesi2017-12-198-197/+279
|\| | | | | | | | | | | | | | types: add validation, use it in commands
| * | | | types: add validation to partial parserAldo Cortesi2017-12-193-18/+39
| | | | |
| * | | | types: use new type validation mechanism in commandsAldo Cortesi2017-12-196-99/+33
| | | | |
| * | | | types: add validation functionsAldo Cortesi2017-12-192-6/+129
| | | | |
| * | | | types: cleanups and minor refactoringsAldo Cortesi2017-12-195-76/+80
| | | | |
* | | | | Merge pull request #2705 from mhils/issue-2694Maximilian Hils2017-12-181-0/+22
|\ \ \ \ \ | |/ / / / |/| | | | Re-add body editing
| * | | | implement body editing, fix #2694Maximilian Hils2017-12-181-0/+22
| | | | |
* | | | | Merge pull request #2702 from Kriechi/fix-2640Thomas Kriechbaumer2017-12-1814-19/+128
|\ \ \ \ \ | |/ / / / |/| | | | improve websocket dumps
| * | | | add doc stringThomas Kriechbaumer2017-12-181-0/+5
| | | | |
| * | | | add testsThomas Kriechbaumer2017-12-185-3/+33
| | | | |
| * | | | ignore contrib type errorsThomas Kriechbaumer2017-12-183-0/+7
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 05:07:12 +0000