aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
|/ /
* | py3: fix bytes vs. strThomas Kriechbaumer2016-07-032-9/+9
* | http2: Remove TestReadRequestConnect testShadab Zafar2016-07-031-31/+0
* | h2: move header parsing to netlibShadab Zafar2016-07-034-67/+48
|/
* Merge pull request #1308 from dufferzafar/lint-hotfixThomas Kriechbaumer2016-07-022-3/+0
|\
| * fix lint issuesShadab Zafar2016-07-022-3/+0
|/
* minor fixesMaximilian Hils2016-07-014-8/+8
* fix tcp message handlingMaximilian Hils2016-07-018-22/+44
* py3++Maximilian Hils2016-07-019-48/+56
* Handle case when scheme is NoneShadab Zafar2016-07-011-1/+1
* py3++: test/mitmproxy/test_serverShadab Zafar2016-07-016-35/+39
* Merge pull request #1302 from mhils/update-dependenciesMaximilian Hils2016-06-292-9/+8
|\
| * update to latest `typing` releaseMaximilian Hils2016-06-292-4/+3
| * bump depdenciesMaximilian Hils2016-06-291-6/+6
|/
* Merge pull request #1301 from mitmproxy/simplify-toxMaximilian Hils2016-06-2910-84/+64
|\
| * appveyor: build snapshots on masterMaximilian Hils2016-06-291-1/+1
| * remove superfluous statements in tox.iniMaximilian Hils2016-06-291-3/+0
| * collect coverage on appveyorMaximilian Hils2016-06-281-1/+3
| * minor fixesMaximilian Hils2016-06-284-3/+2
| * do not run tests in parallelMaximilian Hils2016-06-281-1/+1
| * watchdog: always use PollingObserverMaximilian Hils2016-06-281-6/+4
| * compile docs on python 3.5Maximilian Hils2016-06-283-3/+3