Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | accept_addon -> resume, intercept/resume events | Aldo Cortesi | 2016-10-18 | 8 | -18/+23 |
| | |||||
* | master.duplicate_flow -> state.duplicate_flow | Aldo Cortesi | 2016-10-18 | 8 | -24/+28 |
| | | | | | | This is a pure operation on state, and doesn't belong on master. Part of prep to move state to an addon. | ||||
* | Response body streaming to addon | Aldo Cortesi | 2016-10-18 | 11 | -53/+76 |
| | |||||
* | Remove mention of pathod.net from README | Aldo Cortesi | 2016-10-18 | 1 | -6/+1 |
| | | | | I'm just about to redirect this to mitmproxy.org | ||||
* | dumper: limit url length | Maximilian Hils | 2016-10-17 | 1 | -0/+2 |
| | |||||
* | fix tests | Maximilian Hils | 2016-10-17 | 1 | -2/+4 |
| | |||||
* | remove empty lines at beginning of file | Thomas Kriechbaumer | 2016-10-17 | 88 | -91/+0 |
| | |||||
* | removed unused import | Thomas Kriechbaumer | 2016-10-17 | 1 | -2/+0 |
| | |||||
* | Merge pull request #1619 from mhils/fix-socks-tls | Maximilian Hils | 2016-10-16 | 2 | -3/+13 |
|\ | | | | | Fix SOCKS5 mode with TLS | ||||
| * | fix socks5 mode with tls | Maximilian Hils | 2016-10-16 | 2 | -3/+13 |
| | | |||||
* | | fix redirect_requests.py example | Maximilian Hils | 2016-10-16 | 1 | -2/+1 |
|/ | |||||
* | python3: update README and setup.py trove classifiers | Aldo Cortesi | 2016-10-17 | 2 | -5/+3 |
| | |||||
* | update protobuf, reenable for py3 (#1618) | Maximilian Hils | 2016-10-16 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1617 from cortesi/object | Aldo Cortesi | 2016-10-17 | 167 | -391/+261 |
|\ | | | | | python3 | ||||
| * | python3: clean up super and __future__ | Aldo Cortesi | 2016-10-17 | 140 | -267/+136 |
| | | |||||
| * | python3: clean up class brackets | Aldo Cortesi | 2016-10-17 | 69 | -122/+122 |
| | | |||||
| * | Zap object base class | Aldo Cortesi | 2016-10-17 | 65 | -114/+115 |
|/ | |||||
* | actually fix merge :see_no_evil: | Maximilian Hils | 2016-10-16 | 2 | -16/+15 |
| | |||||
* | fix merge | Maximilian Hils | 2016-10-16 | 1 | -7/+1 |
| | |||||
* | Merge branch 'such-types' | Maximilian Hils | 2016-10-16 | 27 | -230/+202 |
|\ | |||||
| * | py2--: inline type info | Maximilian Hils | 2016-10-16 | 27 | -239/+206 |
| | | |||||
* | | Merge pull request #1615 from cortesi/python3a | Aldo Cortesi | 2016-10-17 | 60 | -336/+208 |
|\ \ | |/ |/| | exterminate six | ||||
| * | test & examples: zap six | Aldo Cortesi | 2016-10-17 | 30 | -133/+107 |
| | | |||||
| * | mitmproxy: zap six | Aldo Cortesi | 2016-10-17 | 24 | -191/+97 |
| | | |||||
| * | pathod: remove six | Aldo Cortesi | 2016-10-17 | 7 | -19/+11 |
| | | |||||
* | | update pydivert dependency (#1614) | Maximilian Hils | 2016-10-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1613 from cortesi/python3 | Aldo Cortesi | 2016-10-17 | 31 | -203/+90 |
|\| | | | | | First-order conversion to Python3-only | ||||
| * | First-order conversion to Python3-only | Aldo Cortesi | 2016-10-17 | 31 | -203/+90 |
|/ | | | | | | - Zap various occurrences of Python2 in docs and scripts - Remove six from netlib, and some other places where obvious project-wide search and replace works. | ||||
* | Add stub converter for 0.19 io format | Aldo Cortesi | 2016-10-17 | 1 | -0/+6 |
| | |||||
* | Bump version post release | Aldo Cortesi | 2016-10-17 | 1 | -1/+1 |
| | |||||
* | Bump to 0.18.1 to fix pypi obstreperousness | Aldo Cortesi | 2016-10-16 | 3 | -106/+67 |
| | | | | Also include contriburors update. | ||||
* | Merge pull request #1602 from cortesi/scriptdocs | Aldo Cortesi | 2016-10-16 | 30 | -466/+624 |
|\ | | | | | docs: stub out new script documentation | ||||
| * | docs: concurrency, developing scripts | Aldo Cortesi | 2016-10-16 | 3 | -32/+20 |
| | | |||||
| * | scripts: keep scripts just after the ScriptLoader in addon chain | Aldo Cortesi | 2016-10-16 | 4 | -16/+43 |
| | | | | | | | | | | | | We need scripts to run _before_ filestreamer, so we can't just add them to the end of the chain. This patch also fixes an issue that could cause scripts to be initialised un-necessarily if only the order of scripts in options changed. | ||||
| * | docs: scripts on saved flows | Aldo Cortesi | 2016-10-16 | 1 | -7/+23 |
| | | |||||
| * | mitmdump: fix addon order - dumper must be last | Aldo Cortesi | 2016-10-16 | 1 | -1/+1 |
| | | | | | | | | This is so we can see the effects of script rewriting using -dd. | ||||
| * | docs: link to correct tag | Maximilian Hils | 2016-10-16 | 1 | -5/+16 |
| | | |||||
| * | docs: logging and the context | Aldo Cortesi | 2016-10-16 | 6 | -27/+68 |
| | | |||||
| * | scripts: handle SystemExit from scripts explicitly | Aldo Cortesi | 2016-10-16 | 1 | -0/+2 |
| | | |||||
| * | mitmdump: show script errors on startup | Aldo Cortesi | 2016-10-16 | 1 | -1/+1 |
| | | | | | | | | | | Add the terminal logger before any other addons, so we see script errors on startup. | ||||
| * | docs: overview, classes, arguments | Aldo Cortesi | 2016-10-16 | 7 | -47/+86 |
| | | |||||
| * | docs: improve external source links, tweak code docs | Aldo Cortesi | 2016-10-16 | 3 | -38/+53 |
| | | |||||
| * | Clean up models.http a bit | Aldo Cortesi | 2016-10-16 | 1 | -31/+17 |
| | | | | | | | | | | - We don't need a deprecation warning here - Bring imports inline with policy | ||||
| * | docs: cleanups improvements and fighting sphinx | Aldo Cortesi | 2016-10-16 | 18 | -356/+389 |
|/ | | | | | | | | - Hide links to internal code listings, and link to github instead - Improve formatting of code/example captions - Fix outdated documentation of command-line options - Complete documentation of all events + improved formatting - tcp_open -> tcp_start, tcp_close -> tcp_end to reduce confusion | ||||
* | fix #1611 | Maximilian Hils | 2016-10-15 | 1 | -4/+2 |
| | |||||
* | update CHANGELOG | Maximilian Hils | 2016-10-15 | 1 | -0/+48 |
| | |||||
* | Merge pull request #1610 from mhils/issue-1605 | Maximilian Hils | 2016-10-14 | 2 | -12/+19 |
|\ | | | | | Fix #1605 | ||||
| * | add regression test for #1605 | Maximilian Hils | 2016-10-14 | 1 | -0/+13 |
| | | |||||
| * | fix #1605 | Maximilian Hils | 2016-10-13 | 1 | -12/+6 |
|/ | |||||
* | Issue 1461 (#1609) | Sanchit Sokhey | 2016-10-13 | 1 | -3/+14 |
| | | | | | | | | | | | | | | * doc changes * doc changes * doc changes * doc changes * Documentation updated * Documentation for custom certificate updated |