aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Remove py35 section from tox.iniShadab Zafar2016-07-091-5/+0
| | | | |
| * | | | strutils.hexdump returns native_stringsShadab Zafar2016-07-092-2/+2
| | | | |
| * | | | Set verbosity & flow_detail to 0Shadab Zafar2016-07-091-0/+12
| | | | |
| * | | | py3++Shadab Zafar2016-07-093-24/+29
| | | | |
| * | | | py3++: test_dumpShadab Zafar2016-07-093-5/+6
| | | | |
* | | | | travis: move osx test to the topMaximilian Hils2016-07-091-6/+6
|/ / / / | | | | | | | | OSX is the slow one, so it should start straight away.
* | | | Merge pull request #1327 from mitmproxy/remove-script-contextMaximilian Hils2016-07-0848-312/+267
|\ \ \ \ | | | | | | | | | | Remove script context
| * | | | move script context to mitmproxy.ctxMaximilian Hils2016-07-0811-41/+40
| | | | |
| * | | | remove script contextsMaximilian Hils2016-07-0716-200/+131
| | | | |
| * | | | remove context from all scriptsMaximilian Hils2016-07-0733-112/+137
| | | | |
* | | | | py3++Maximilian Hils2016-07-083-2/+6
| | | | |
* | | | | fix #1314Maximilian Hils2016-07-082-21/+23
| | | | |
* | | | | Merge pull request #1330 from jpkrause/masterMaximilian Hils2016-07-086-72/+14
|\ \ \ \ \ | | | | | | | | | | | | Added flow converters for versions 0.11 and 0.12
| * | | | | Updated coding style and modified flow format compat test to use v0.11 and ↵jpkrause2016-07-086-72/+5
| | | | | | | | | | | | | | | | | | | | | | | | v0.10 dump files
| * | | | | Added flow converters for versions 0.11 and 0.12jpkrause2016-07-081-0/+9
|/ / / / /
* | | | | Merge pull request #1328 from Kriechi/fix-1326Thomas Kriechbaumer2016-07-081-19/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | | http2: fix self-depended streams
| * | | | http2: fix self-depended streamsThomas Kriechbaumer2016-07-081-19/+26
| |/ / /
* / / / simplify tox test exclusionThomas Kriechbaumer2016-07-081-1/+1
|/ / /
* | | 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
|\ \ \ | | | | | | | | HTTP/2: Python 3-compatibility
| * | | 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
|\ \ \ | | | | | | | | Exclude harparser script on Python 3
| * | | disable harparser on py3Maximilian Hils2016-07-073-1/+14
|/ / /
* | | Merge pull request #1318 from mhils/tnetstring3-unicode-typeThomas Kriechbaumer2016-07-0714-278/+212
|\ \ \ | | | | | | | | [tests actually pass] Add unicode to tnetstring3
| * | | 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 view
| * | | Detect JSON API media type as a json content viewLinmiao Xu2016-07-062-1/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | IANA assignment here: https://www.iana.org/assignments/media-types/application/vnd.api+json More about JSON API: https://github.com/json-api/json-api
* | | py3++, multidict fixesMaximilian Hils2016-07-068-46/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit improves Python 3 compatibility and fixes two multidict issues: 1. Headers.items(multi=True) now decodes fields 2. MultiDict.clear(item) has been removed, as Python's MutableMapping already defines .clear() with different semantics. This is confusing for everyone who expects a dict-like object. `.pop("attr", None)` is not fantastic, but it's the Python way to do it.
* | | Merge pull request #1319 from mitmproxy/fix-py27-encoding-issuesMaximilian Hils2016-07-062-5/+11
|\ \ \ | | | | | | | | Fix pathod log encoding
| * | | 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
| | | | | | | | | https://bitbucket.org/dundeemt/pysftp/issues/97/pysftp-029-breaks-builds
* | | 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 handling
| * | | remove clean_bin, clarify unicode handlingMaximilian Hils2016-07-056-57/+93
| | | |