aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Py3: Use cStringIO from six.movesShadab Zafar2016-05-281-3/+3
* Fix crash in mitmproxy when viewing responsesAldo Cortesi2016-05-281-1/+3
* Merge pull request #1169 from gzzhanghao/contentviewMaximilian Hils2016-05-277-88/+112
|\
| * Merge remote-tracking branch 'origin/master' into contentviewJason2016-05-2832-135/+253
| |\ | |/ |/|
* | Merge pull request #1119 from dufferzafar/pathod-portMaximilian Hils2016-05-269-43/+35
|\ \
| * | Enable travis Py3 testing for test_utilsShadab Zafar2016-05-261-2/+2
| * | Go Python 3 by default with the bytes conversionShadab Zafar2016-05-261-2/+4
| * | remove str()Shadab Zafar2016-05-261-1/+1
| * | Remove inner_repr, fixup escape_unprintablesShadab Zafar2016-05-262-26/+8
| * | Use escaped_str functions for TokValueLiteralShadab Zafar2016-05-261-6/+7
| * | Remove Py3 specific checkShadab Zafar2016-05-261-2/+1
| * | Use BytesIO in pathod appShadab Zafar2016-05-261-2/+2
| * | Py3: Handle bytes case in inner_reprShadab Zafar2016-05-262-1/+3
| * | Removed wrong importShadab Zafar2016-05-261-0/+1
| * | Py3: inner_repr and escape_unprintablesShadab Zafar2016-05-261-2/+7
| * | Py3: Import and Other misc. stuffShadab Zafar2016-05-265-13/+13
|/ /
* | fix py3 testsMaximilian Hils2016-05-251-1/+1
* | bytes_to_escaped_str: always escape single quotesMaximilian Hils2016-05-253-2/+10
* | escaped_str_to_bytes: support unicode on python 2Maximilian Hils2016-05-252-4/+11
* | Refactor dev.shAldo Cortesi2016-05-263-24/+10
* | Merge pull request #1168 from Kriechi/venv-py3Aldo Cortesi2016-05-262-7/+24
|\ \
| * | add a py3 venv in dev environmentThomas Kriechbaumer2016-05-252-7/+24
* | | Update issue_template.mdMaximilian Hils2016-05-241-0/+1
|/ /
* | Merge pull request #1127 from mitmproxy/tcp-flowsThomas Kriechbaumer2016-05-2313-68/+180
|\ \
| * | tests++Maximilian Hils2016-05-202-2/+32
| * | add FlowMaster.active_flowsMaximilian Hils2016-05-193-16/+13
| * | tests: finish connections properlyMaximilian Hils2016-05-191-0/+1
| * | fix tests, don't double-add error'd flowsMaximilian Hils2016-05-192-3/+3
| * | minor fixes, adjust testsMaximilian Hils2016-05-195-13/+13
| * | mimtdump: add basic support for tcp flowsMaximilian Hils2016-05-197-55/+139
* | | minor fixes (#1165)Maximilian Hils2016-05-233-7/+2
| | * [web] add default value for text viewsJason2016-05-281-2/+2
| | * [web] eliminate RawMixinJason2016-05-281-17/+47
| | * [web] use props.location instead of context.locationJason2016-05-241-4/+3
| | * [web] eliminate Router mixinJason2016-05-246-71/+66
| |/ |/|
* | warn users if rfile == outfile, refs #1117Maximilian Hils2016-05-211-0/+12
* | fix weight value serializationThomas Kriechbaumer2016-05-211-1/+2
* | Merge pull request #1164 from Kriechi/improve-http2Maximilian Hils2016-05-211-4/+22
|\ \
| * | kill streams if connection gets terminatedThomas Kriechbaumer2016-05-211-3/+8
| * | implement transparent Priority updatesThomas Kriechbaumer2016-05-211-0/+12
| * | fix typoThomas Kriechbaumer2016-05-211-1/+1
| * | immediately send push to clientThomas Kriechbaumer2016-05-211-0/+1
| |/
* | Merge branch 'issue-1099'Maximilian Hils2016-05-203-1/+10
|\ \
| * | fix #1099Maximilian Hils2016-05-203-1/+10
* | | Merge branch 'mhils-multidict'Aldo Cortesi2016-05-2131-503/+883
|\ \ \
| * | | Clean un-needed importsAldo Cortesi2016-05-211-2/+0
| * | | A clearer implementation of MultiDictViewAldo Cortesi2016-05-216-108/+119
| * | | Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-mul...Aldo Cortesi2016-05-2131-502/+873
| |\| |
| | * | tests++Maximilian Hils2016-05-205-104/+232
| | * | fix Header docsMaximilian Hils2016-05-201-3/+3