aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-0723-1539/+1600
|\
| * fix all pathod tests on Windows :tada:Maximilian Hils2016-06-061-14/+14
| * Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-06-061-8/+4
| |\
| | * web: accept all falsey sortFns in sortedIndexOfMaximilian Hils2016-06-061-8/+4
| * | Merge branch 'pathod-lang-http'Maximilian Hils2016-06-069-108/+115
| |\ \ | | |/ | |/|
| | * fix NestedMessage encodingMaximilian Hils2016-06-062-2/+2
| | * fix .freeze(), improve testsMaximilian Hils2016-06-063-6/+11
| | * update pyparsingMaximilian Hils2016-06-061-1/+1
| | * Py3: encode() status code responsesShadab Zafar2016-06-061-1/+1
| | * Py3: Exception doesn't have to be bytesShadab Zafar2016-06-061-1/+1
| | * Py3: Fix status_code and other tests by using byte literalsShadab Zafar2016-06-061-7/+7
| | * Py3: Fix corresponding base.Integer test in test_language_baseShadab Zafar2016-06-062-2/+2
| | * Py3: Store base.Integer value as bytesShadab Zafar2016-06-061-2/+2
| | * Py3: Fix useragent testsShadab Zafar2016-06-061-4/+4
| | * Py3: UASTRINGS should be indexed by and return bytesShadab Zafar2016-06-061-1/+1
| | * Py3: decode() input before creating new Header tokenShadab Zafar2016-06-061-4/+4
| | * Py3: Fix websocket testsShadab Zafar2016-06-061-10/+10
| | * Py3: Use BytesIO in tutils.renderShadab Zafar2016-06-061-1/+2
| | * Py3: Use bytes_to_escaped_str for escaping messageShadab Zafar2016-06-061-3/+4
| | * Py3: More byte literalsShadab Zafar2016-06-061-6/+6
| | * Enable Travis for test/pathod/test_language_httpShadab Zafar2016-06-062-3/+3
| | * Py3: Use byte string literalsShadab Zafar2016-06-062-24/+24
| | * Py3: Use BytesIO instead of StringIO for testsShadab Zafar2016-06-061-8/+8
| | * Py3: Use global next() instead of iterator methodShadab Zafar2016-06-061-23/+23
| | * Py3: Return bytes from _Component classShadab Zafar2016-06-061-3/+3
| * | netlib: always disconnect when using context managerMaximilian Hils2016-06-061-2/+4
| |/
| * Py3: Fix tests by using byte literalsShadab Zafar2016-06-061-6/+6
| * Py3: Use global next() instead of iterator methodShadab Zafar2016-06-061-1/+1
| * fix travis tests on masterMaximilian Hils2016-06-061-2/+2
| * fix pathod test on WindowsMaximilian Hils2016-06-061-1/+2
| * Fix sequencing in Pathoc websocket termination testAldo Cortesi2016-06-062-3/+5
| * Close when Pathoc.connect raises an exceptionAldo Cortesi2016-06-061-35/+41
| * Make more of the pathod test suite use synchronisationAldo Cortesi2016-06-061-39/+11
| * Fix lintAldo Cortesi2016-06-061-1/+1
| * web: fix list update propagationMaximilian Hils2016-06-053-30/+14
| * Merge branch 'such-redux'Maximilian Hils2016-06-056-1318/+1409
| |\
| | * web: modernize flow table columnsMaximilian Hils2016-06-054-1312/+1404
| | * web: update reactMaximilian Hils2016-06-051-3/+2
| | * web: fix list reducerMaximilian Hils2016-06-051-3/+3
* | | Migrate pathod docs to SphinxAldo Cortesi2016-06-0730-1564/+643
|/ /
* | Merge pull request #1212 from mitmproxy/such-reduxAldo Cortesi2016-06-0610-703/+434
|\|
| * web: completely move flow state to reduxMaximilian Hils2016-06-0410-703/+434
* | Merge pull request #1215 from redfast00/masterAldo Cortesi2016-06-062-3/+3
|\ \
| * | fix multidict unittestsredfast002016-06-051-2/+2
| * | Now keeps header capitalizationredfast002016-06-051-1/+1
* | | Merge pull request #1211 from cortesi/pathodAldo Cortesi2016-06-0617-654/+76
|\ \ \
| * | | Ditch pathod static assetsAldo Cortesi2016-06-059-215/+0
| * | | Remove last vestiges of noapi and noweb from pathodAldo Cortesi2016-06-055-41/+14
| * | | First-order removal of pathod API and appAldo Cortesi2016-06-056-398/+62
* | | | Use BytesIO instead of StringIOShadab Zafar2016-06-061-2/+2