Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | fix Python 2 tests | Maximilian Hils | 2016-05-28 | 1 | -2/+2 | |
* | | | | Enable Travis for test_log | Shadab Zafar | 2016-05-28 | 1 | -2/+2 | |
* | | | | Py3: Use cStringIO from six.moves | Shadab Zafar | 2016-05-28 | 1 | -3/+3 | |
| |_|/ |/| | | ||||||
* | | | Fix crash in mitmproxy when viewing responses | Aldo Cortesi | 2016-05-28 | 1 | -1/+3 | |
|/ / | ||||||
* | | Merge pull request #1169 from gzzhanghao/contentview | Maximilian Hils | 2016-05-27 | 7 | -88/+112 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'origin/master' into contentview | Jason | 2016-05-28 | 32 | -135/+253 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1119 from dufferzafar/pathod-port | Maximilian Hils | 2016-05-26 | 9 | -43/+35 | |
|\ \ \ | ||||||
| * | | | Enable travis Py3 testing for test_utils | Shadab Zafar | 2016-05-26 | 1 | -2/+2 | |
| * | | | Go Python 3 by default with the bytes conversion | Shadab Zafar | 2016-05-26 | 1 | -2/+4 | |
| * | | | remove str() | Shadab Zafar | 2016-05-26 | 1 | -1/+1 | |
| * | | | Remove inner_repr, fixup escape_unprintables | Shadab Zafar | 2016-05-26 | 2 | -26/+8 | |
| * | | | Use escaped_str functions for TokValueLiteral | Shadab Zafar | 2016-05-26 | 1 | -6/+7 | |
| * | | | Remove Py3 specific check | Shadab Zafar | 2016-05-26 | 1 | -2/+1 | |
| * | | | Use BytesIO in pathod app | Shadab Zafar | 2016-05-26 | 1 | -2/+2 | |
| * | | | Py3: Handle bytes case in inner_repr | Shadab Zafar | 2016-05-26 | 2 | -1/+3 | |
| * | | | Removed wrong import | Shadab Zafar | 2016-05-26 | 1 | -0/+1 | |
| * | | | Py3: inner_repr and escape_unprintables | Shadab Zafar | 2016-05-26 | 1 | -2/+7 | |
| * | | | Py3: Import and Other misc. stuff | Shadab Zafar | 2016-05-26 | 5 | -13/+13 | |
|/ / / | ||||||
* | | | fix py3 tests | Maximilian Hils | 2016-05-25 | 1 | -1/+1 | |
* | | | bytes_to_escaped_str: always escape single quotes | Maximilian Hils | 2016-05-25 | 3 | -2/+10 | |
* | | | escaped_str_to_bytes: support unicode on python 2 | Maximilian Hils | 2016-05-25 | 2 | -4/+11 | |
| |/ |/| | ||||||
* | | Refactor dev.sh | Aldo Cortesi | 2016-05-26 | 3 | -24/+10 | |
* | | Merge pull request #1168 from Kriechi/venv-py3 | Aldo Cortesi | 2016-05-26 | 2 | -7/+24 | |
|\ \ | ||||||
| * | | add a py3 venv in dev environment | Thomas Kriechbaumer | 2016-05-25 | 2 | -7/+24 | |
* | | | Update issue_template.md | Maximilian Hils | 2016-05-24 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #1127 from mitmproxy/tcp-flows | Thomas Kriechbaumer | 2016-05-23 | 13 | -68/+180 | |
|\ \ | ||||||
| * | | tests++ | Maximilian Hils | 2016-05-20 | 2 | -2/+32 | |
| * | | add FlowMaster.active_flows | Maximilian Hils | 2016-05-19 | 3 | -16/+13 | |
| * | | tests: finish connections properly | Maximilian Hils | 2016-05-19 | 1 | -0/+1 | |
| * | | fix tests, don't double-add error'd flows | Maximilian Hils | 2016-05-19 | 2 | -3/+3 | |
| * | | minor fixes, adjust tests | Maximilian Hils | 2016-05-19 | 5 | -13/+13 | |
| * | | mimtdump: add basic support for tcp flows | Maximilian Hils | 2016-05-19 | 7 | -55/+139 | |
* | | | minor fixes (#1165) | Maximilian Hils | 2016-05-23 | 3 | -7/+2 | |
| | * | [web] add default value for text views | Jason | 2016-05-28 | 1 | -2/+2 | |
| | * | [web] eliminate RawMixin | Jason | 2016-05-28 | 1 | -17/+47 | |
| | * | [web] use props.location instead of context.location | Jason | 2016-05-24 | 1 | -4/+3 | |
| | * | [web] eliminate Router mixin | Jason | 2016-05-24 | 6 | -71/+66 | |
| |/ |/| | ||||||
* | | warn users if rfile == outfile, refs #1117 | Maximilian Hils | 2016-05-21 | 1 | -0/+12 | |
* | | fix weight value serialization | Thomas Kriechbaumer | 2016-05-21 | 1 | -1/+2 | |
* | | Merge pull request #1164 from Kriechi/improve-http2 | Maximilian Hils | 2016-05-21 | 1 | -4/+22 | |
|\ \ | ||||||
| * | | kill streams if connection gets terminated | Thomas Kriechbaumer | 2016-05-21 | 1 | -3/+8 | |
| * | | implement transparent Priority updates | Thomas Kriechbaumer | 2016-05-21 | 1 | -0/+12 | |
| * | | fix typo | Thomas Kriechbaumer | 2016-05-21 | 1 | -1/+1 | |
| * | | immediately send push to client | Thomas Kriechbaumer | 2016-05-21 | 1 | -0/+1 | |
| |/ | ||||||
* | | Merge branch 'issue-1099' | Maximilian Hils | 2016-05-20 | 3 | -1/+10 | |
|\ \ | ||||||
| * | | fix #1099 | Maximilian Hils | 2016-05-20 | 3 | -1/+10 | |
* | | | Merge branch 'mhils-multidict' | Aldo Cortesi | 2016-05-21 | 31 | -503/+883 | |
|\ \ \ | ||||||
| * | | | Clean un-needed imports | Aldo Cortesi | 2016-05-21 | 1 | -2/+0 | |
| * | | | A clearer implementation of MultiDictView | Aldo Cortesi | 2016-05-21 | 6 | -108/+119 | |
| * | | | Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-mul... | Aldo Cortesi | 2016-05-21 | 31 | -502/+873 | |
| |\| | |