Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | controller.Log -> log.Log | Aldo Cortesi | 2016-10-19 | 7 | -51/+51 | |
|/ | ||||||
* | Merge pull request #1631 from cortesi/nomaster | Aldo Cortesi | 2016-10-19 | 31 | -232/+241 | |
|\ | ||||||
| * | Kill flow.master - create master.Master | Aldo Cortesi | 2016-10-19 | 31 | -232/+241 | |
* | | Merge pull request #1630 from cortesi/multiserv | Aldo Cortesi | 2016-10-19 | 28 | -79/+75 | |
|\| | ||||||
| * | Let's dispense with this fiction that we support multiple servers | Aldo Cortesi | 2016-10-19 | 28 | -79/+75 | |
* | | Merge pull request #1629 from cortesi/addonhalt | Aldo Cortesi | 2016-10-19 | 5 | -3/+12 | |
|\| | ||||||
| * | addons: add AddonHalt exception | Aldo Cortesi | 2016-10-19 | 5 | -3/+12 | |
* | | Merge pull request #1628 from cortesi/webapp | Aldo Cortesi | 2016-10-19 | 36 | -151/+262 | |
|\| | ||||||
| * | web app cleanups: tests and examples | Aldo Cortesi | 2016-10-19 | 3 | -26/+10 | |
| * | pathoc: Guess the Host header from the path if possible | Aldo Cortesi | 2016-10-19 | 1 | -3/+14 | |
| * | Web apps to addons | Aldo Cortesi | 2016-10-19 | 34 | -143/+259 | |
* | | Merge pull request #1627 from cortesi/stateclean | Aldo Cortesi | 2016-10-18 | 3 | -16/+21 | |
|\| | ||||||
| * | No need for all builtins to be loaded for server tests | Aldo Cortesi | 2016-10-18 | 3 | -16/+21 | |
* | | Merge pull request #1626 from cortesi/state | Aldo Cortesi | 2016-10-18 | 30 | -173/+121 | |
|\| | ||||||
| * | Convert flow.state to an addon | Aldo Cortesi | 2016-10-18 | 25 | -158/+101 | |
| * | accept_addon -> resume, intercept/resume events | Aldo Cortesi | 2016-10-18 | 8 | -18/+23 | |
* | | Merge pull request #1625 from cortesi/dupflow | Aldo Cortesi | 2016-10-18 | 8 | -24/+28 | |
|\| | ||||||
| * | master.duplicate_flow -> state.duplicate_flow | Aldo Cortesi | 2016-10-18 | 8 | -24/+28 | |
* | | Merge pull request #1624 from cortesi/streambodies | Aldo Cortesi | 2016-10-18 | 11 | -53/+76 | |
|\| | ||||||
| * | 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 | |
* | 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 | 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: 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 | |
|\ \ | |/ |/| | ||||||
| * | 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 |