aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove context from all scriptsMaximilian Hils2016-07-0733-112/+137
* fix testsMaximilian Hils2016-07-071-0/+1
* tests++Maximilian Hils2016-07-072-1/+16
* py3++Maximilian Hils2016-07-077-19/+20
* py3++Maximilian Hils2016-07-077-88/+114
* reorder travis jobsThomas Kriechbaumer2016-07-071-7/+7
* Merge pull request #1325 from Kriechi/dufferzafar-py3-h2Thomas Kriechbaumer2016-07-073-13/+13
|\
| * py3++Thomas Kriechbaumer2016-07-072-9/+9
| * py3++: test_protocol_http2Shadab Zafar2016-07-072-4/+4
|/
* py3++Maximilian Hils2016-07-074-4/+5
* Merge pull request #1323 from mhils/test-examplesMaximilian Hils2016-07-073-1/+14
|\
| * disable harparser on py3Maximilian Hils2016-07-073-1/+14
|/
* Merge pull request #1318 from mhils/tnetstring3-unicode-typeThomas Kriechbaumer2016-07-0714-278/+212
|\
| * sni is now str, not bytesMaximilian Hils2016-07-0610-43/+44
| * fix testsMaximilian Hils2016-07-062-2/+2
| * fix dump file cross compat between python versionsMaximilian Hils2016-07-062-32/+61
| * tnetstring3: adapt to unicode supportMaximilian Hils2016-07-065-41/+66
| * add tnetstring unicode typeMaximilian Hils2016-07-066-750/+251
| * tnetstring: keys are str on py3. migrate flow.io_compatMaximilian Hils2016-07-067-16/+20
| * add python3 tnetstring implementationMaximilian Hils2016-07-066-372/+746
* | Merge pull request #1322 from linrock/json-apiMaximilian Hils2016-07-062-1/+11
|\ \ | |/ |/|
| * Detect JSON API media type as a json content viewLinmiao Xu2016-07-062-1/+11
|/
* py3++, multidict fixesMaximilian Hils2016-07-068-46/+68
* Merge pull request #1319 from mitmproxy/fix-py27-encoding-issuesMaximilian Hils2016-07-062-5/+11
|\
| * fix pathod log encodingMaximilian Hils2016-07-062-5/+11
* | py3++Maximilian Hils2016-07-066-39/+26
|/
* blacklist pysftp 0.2.9Maximilian Hils2016-07-061-1/+1
* fix issue introduced in 72f3b2bMaximilian Hils2016-07-061-1/+1
* minor code improvementMaximilian Hils2016-07-051-5/+6
* Merge branch 'dont-cache-tox'Maximilian Hils2016-07-053-9/+2
|\
| * don't cache tox on CIMaximilian Hils2016-07-053-9/+2
* | Merge pull request #1315 from mitmproxy/better-unicode-handlingMaximilian Hils2016-07-056-57/+93
|\ \ | |/ |/|
| * remove clean_bin, clarify unicode handlingMaximilian Hils2016-07-056-57/+93
* | Merge pull request #1316 from mhils/faster-lintMaximilian Hils2016-07-051-2/+1
|\ \
| * | tox: dont make sdist when lintingMaximilian Hils2016-07-051-2/+1
| |/
* | Merge pull request #1297 from dufferzafar/py3-flow-exportMaximilian Hils2016-07-055-26/+41
|\ \ | |/ |/|
| * py3++: test_flow_exportShadab Zafar2016-07-024-19/+34
| * Replace map + lambda with list comprehensionsShadab Zafar2016-07-021-3/+3
| * netlib: condition on PY2 rather than on PY3Shadab Zafar2016-07-021-4/+4
* | Merge pull request #1244 from Kriechi/http2-testsThomas Kriechbaumer2016-07-053-6/+134
|\ \
| * | http2: test fatal connection terminationThomas Kriechbaumer2016-07-051-1/+52
| * | http2: test throttling at MAX_CONCURRENT_STREAMSThomas Kriechbaumer2016-07-052-6/+80
| * | http2: remove forbidden headersThomas Kriechbaumer2016-07-051-0/+3
|/ /
* | always recreate tox envsThomas Kriechbaumer2016-07-051-1/+1
* | prevent early priority changesThomas Kriechbaumer2016-07-051-8/+9
* | Merge pull request #1245 from Kriechi/http2-priority-informationThomas Kriechbaumer2016-07-052-18/+49
|\ \
| * | handle related events from h2Thomas Kriechbaumer2016-07-051-0/+7
| * | improve end_stream handlingThomas Kriechbaumer2016-07-051-5/+11
| * | http2: implement direct handling of priorityThomas Kriechbaumer2016-07-051-12/+30
| * | bump h2 dependencyThomas Kriechbaumer2016-07-051-1/+1
|/ /