Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | mitmweb: add --no-browser | Maximilian Hils | 2016-11-25 | 3 | -3/+13 | |
| | ||||||
* | fix pyinstaller (#1788) | Maximilian Hils | 2016-11-25 | 9 | -122/+27 | |
| | ||||||
* | update dependencies (#1789) | Maximilian Hils | 2016-11-25 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'mitmweb-eventlog' | Maximilian Hils | 2016-11-23 | 22 | -275/+505 | |
|\ | ||||||
| * | mitmweb: 100% app test coverage, numerous fixes | Maximilian Hils | 2016-11-23 | 14 | -126/+377 | |
| | | ||||||
| * | minor fixes | Maximilian Hils | 2016-11-23 | 4 | -11/+9 | |
| | | ||||||
| * | add eventstore tests | Maximilian Hils | 2016-11-23 | 1 | -0/+32 | |
| | | ||||||
| * | mitmweb: fix event display | Maximilian Hils | 2016-11-23 | 3 | -5/+4 | |
| | | ||||||
| * | mitmweb: cleanup, reimplement eventlog | Maximilian Hils | 2016-11-23 | 4 | -137/+87 | |
| | | ||||||
* | | fix contentview attributes | Maximilian Hils | 2016-11-23 | 1 | -3/+6 | |
| | | ||||||
* | | Merge commit '9bc5adf' | Maximilian Hils | 2016-11-23 | 21 | -178/+454 | |
|\ \ | ||||||
| * | | add more websocket indicators to mitmproxy and mitmdump | Thomas Kriechbaumer | 2016-11-23 | 4 | -20/+32 | |
| | | | ||||||
| * | | add metadata info to flow detail view | Thomas Kriechbaumer | 2016-11-23 | 2 | -2/+11 | |
| | | | ||||||
| * | | websocket: show messages in the eventlog | Thomas Kriechbaumer | 2016-11-23 | 1 | -0/+1 | |
| | | | ||||||
| * | | fix docs | Thomas Kriechbaumer | 2016-11-23 | 2 | -2/+2 | |
| | | | ||||||
| * | | disable TCP support for now | Thomas Kriechbaumer | 2016-11-23 | 1 | -3/+4 | |
| | | | ||||||
| * | | websocket: add tests | Thomas Kriechbaumer | 2016-11-23 | 5 | -4/+37 | |
| | | | ||||||
| * | | websocket: change cmdline option | Thomas Kriechbaumer | 2016-11-23 | 4 | -13/+14 | |
| | | | ||||||
| * | | websocket: add event documentation | Thomas Kriechbaumer | 2016-11-23 | 1 | -12/+46 | |
| | | | ||||||
| * | | add WebSocket flows and messages | Thomas Kriechbaumer | 2016-11-23 | 8 | -54/+238 | |
| | | | ||||||
| * | | rename WebSocket{s,} protocol | Thomas Kriechbaumer | 2016-11-23 | 9 | -45/+46 | |
| |/ | ||||||
* / | bump cryptography dependency | Thomas Kriechbaumer | 2016-11-23 | 1 | -1/+1 | |
|/ | ||||||
* | make the new mypy release happy | Maximilian Hils | 2016-11-23 | 3 | -0/+11 | |
| | ||||||
* | Update README.md | Maximilian Hils | 2016-11-22 | 1 | -0/+1 | |
| | ||||||
* | Update README.md | Maximilian Hils | 2016-11-22 | 1 | -0/+1 | |
| | ||||||
* | remove mitmweb auth | Maximilian Hils | 2016-11-22 | 3 | -18/+1 | |
| | | | | | 9b08279c7c3384f716b66329fefbe97a368189a2 removed the actual functionality. we should not have a command line switch that does nothing. :) | |||||
* | don't set an empty ALPN, refs #1772 | Maximilian Hils | 2016-11-22 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #1769 from mhils/update-pydivert | Maximilian Hils | 2016-11-21 | 2 | -42/+44 | |
|\ | | | | | update pydivert, fix #1749 | |||||
| * | update pydivert, fix #1749 | Maximilian Hils | 2016-11-21 | 2 | -42/+44 | |
|/ | ||||||
* | Descriptive error message for SSL context initialization failure (#1767) | Yoginski | 2016-11-21 | 2 | -1/+35 | |
| | ||||||
* | remove stickycookie example | Maximilian Hils | 2016-11-21 | 2 | -43/+0 | |
| | | | | The recommended way to do this is mitmproxy/addons/stickycookie.py | |||||
* | Merge pull request #1768 from mhils/organize-examples | Maximilian Hils | 2016-11-21 | 43 | -268/+196 | |
|\ | | | | | Organize Examples | |||||
| * | organize examples | Maximilian Hils | 2016-11-21 | 43 | -268/+196 | |
|/ | | | | | | | This commit is largely based on work by Thiago Arrais (@thiagoarrais) and Shane Bradfield (@l33tLumberjack). I wasn't really able to get their PR reasonably merged onto the latest master, so I reapplied their changes manually here and did some further improvements on that. | |||||
* | rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765) | Maximilian Hils | 2016-11-20 | 3 | -0/+22 | |
| | ||||||
* | Merge pull request #1766 from Kriechi/fix-test-race | Thomas Kriechbaumer | 2016-11-20 | 1 | -5/+15 | |
|\ | | | | | tests: fix race condition | |||||
| * | tests: fix race condition | Thomas Kriechbaumer | 2016-11-20 | 1 | -5/+15 | |
| | | ||||||
* | | handle SIGINT with a quit prompt (#1760) | Edgar Boda-Majer | 2016-11-20 | 1 | -9/+18 | |
|/ | ||||||
* | Merge pull request #1751 from dwfreed/patch-1 | Thomas Kriechbaumer | 2016-11-19 | 2 | -3/+6 | |
|\ | | | | | proxy/protocol/base: Allow spoofing fixed source | |||||
| * | proxy/protocol/base: Allow spoofing fixed source | Doug Freed | 2016-11-18 | 2 | -3/+6 | |
| | | | | | | | | | | | | Allow combining --spoof-source-address and --upstream-bind-address to spoof a fixed source address. Also update the help text for --spoof-source-address to indicate this new possibility. | |||||
* | | Merge pull request #1757 from fotinakis/master | Thomas Kriechbaumer | 2016-11-19 | 1 | -1/+1 | |
|\ \ | |/ |/| | Remove dead run_scripthooks example reference. | |||||
| * | Remove dead run_scripthooks example reference. | Mike Fotinakis | 2016-11-17 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1753 from mitmproxy/update-dependencies | Thomas Kriechbaumer | 2016-11-18 | 14 | -3/+20 | |
|\ \ | |/ |/| | Update Dependencies | |||||
| * | lint! | Maximilian Hils | 2016-11-18 | 13 | -1/+18 | |
| | | ||||||
| * | update dependencies | Maximilian Hils | 2016-11-18 | 1 | -2/+2 | |
|/ | ||||||
* | Merge pull request #1729 from mhils/mitmweb-fixes | Maximilian Hils | 2016-11-16 | 9 | -36/+76 | |
|\ | | | | | minor fixes | |||||
| * | fix type checks | Maximilian Hils | 2016-11-16 | 1 | -2/+2 | |
| | | ||||||
| * | mitmweb: start browser on startup | Maximilian Hils | 2016-11-16 | 1 | -3/+34 | |
| | | ||||||
| * | minor fixes | Maximilian Hils | 2016-11-16 | 8 | -31/+40 | |
| | | ||||||
* | | Merge pull request #1752 from dwfreed/patch-2 | Maximilian Hils | 2016-11-16 | 1 | -1/+1 | |
|\ \ | |/ |/| | setup.py: adjust mypy-lang dependency for semver | |||||
| * | setup.py: adjust mypy-lang dependency for semver | Doug Freed | 2016-11-16 | 1 | -1/+1 | |
|/ | | | | Looks like the previous form was a typo. |