Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ | |/ |/| | |||||
| * | 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 | Aldo Cortesi | 2016-10-17 | 31 | -203/+90 |
|/ | |||||
* | 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 |
* | Merge pull request #1602 from cortesi/scriptdocs | Aldo Cortesi | 2016-10-16 | 30 | -466/+624 |
|\ | |||||
| * | 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 |
| * | 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 |
| * | 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 |
| * | 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 |
| * | docs: cleanups improvements and fighting sphinx | Aldo Cortesi | 2016-10-16 | 18 | -356/+389 |
|/ | |||||
* | 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 |
|\ | |||||
| * | 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 |
* | Merge pull request #1603 from mhils/eof | Maximilian Hils | 2016-10-05 | 2 | -16/+5 |
|\ | |||||
| * | simplify eof detection | Maximilian Hils | 2016-10-05 | 2 | -16/+5 |
|/ | |||||
* | Merge pull request #1601 from cortesi/certcap | Aldo Cortesi | 2016-10-05 | 3 | -1/+37 |
|\ | |||||
| * | certutils: cap the cert store size at 100 by default | Aldo Cortesi | 2016-10-05 | 2 | -0/+36 |
| * | debug: use correct fp for memory object output | Aldo Cortesi | 2016-10-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1598 from cortesi/dummystate | Thomas Kriechbaumer | 2016-10-04 | 3 | -10/+13 |
|\ | |||||
| * | mitmdump: use a dummy state object | Aldo Cortesi | 2016-10-04 | 3 | -10/+13 |
* | | use flt instead of filt for flowfilter expressions | Thomas Kriechbaumer | 2016-10-04 | 4 | -11/+11 |
* | | Merge pull request #1597 from cortesi/debug | Aldo Cortesi | 2016-10-04 | 2 | -4/+23 |
|\| | |||||
| * | debug: Hard exit after debug signal | Aldo Cortesi | 2016-10-04 | 2 | -4/+9 |
| * | debug: add a dump of objects in memory | Aldo Cortesi | 2016-10-04 | 1 | -0/+14 |
* | | Merge pull request #1596 from cortesi/addons | Aldo Cortesi | 2016-10-04 | 12 | -46/+81 |
|\| | |||||
| * | Consolidate logging | Aldo Cortesi | 2016-10-04 | 12 | -46/+81 |
* | | Merge pull request #1592 from cortesi/ws | Aldo Cortesi | 2016-10-04 | 11 | -53/+66 |
|\| | |||||
| * | http2: support the requestheaders event | Aldo Cortesi | 2016-10-04 | 3 | -14/+17 |
| * | Clarify channel interaction pattern | Aldo Cortesi | 2016-10-04 | 2 | -12/+7 |