Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Remove py35 section from tox.ini | Shadab Zafar | 2016-07-09 | 1 | -5/+0 | |
| | | | | | ||||||
| * | | | | strutils.hexdump returns native_strings | Shadab Zafar | 2016-07-09 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Set verbosity & flow_detail to 0 | Shadab Zafar | 2016-07-09 | 1 | -0/+12 | |
| | | | | | ||||||
| * | | | | py3++ | Shadab Zafar | 2016-07-09 | 3 | -24/+29 | |
| | | | | | ||||||
| * | | | | py3++: test_dump | Shadab Zafar | 2016-07-09 | 3 | -5/+6 | |
| | | | | | ||||||
* | | | | | travis: move osx test to the top | Maximilian Hils | 2016-07-09 | 1 | -6/+6 | |
|/ / / / | | | | | | | | | OSX is the slow one, so it should start straight away. | |||||
* | | | | Merge pull request #1327 from mitmproxy/remove-script-context | Maximilian Hils | 2016-07-08 | 48 | -312/+267 | |
|\ \ \ \ | | | | | | | | | | | Remove script context | |||||
| * | | | | move script context to mitmproxy.ctx | Maximilian Hils | 2016-07-08 | 11 | -41/+40 | |
| | | | | | ||||||
| * | | | | remove script contexts | Maximilian Hils | 2016-07-07 | 16 | -200/+131 | |
| | | | | | ||||||
| * | | | | remove context from all scripts | Maximilian Hils | 2016-07-07 | 33 | -112/+137 | |
| | | | | | ||||||
* | | | | | py3++ | Maximilian Hils | 2016-07-08 | 3 | -2/+6 | |
| | | | | | ||||||
* | | | | | fix #1314 | Maximilian Hils | 2016-07-08 | 2 | -21/+23 | |
| | | | | | ||||||
* | | | | | Merge pull request #1330 from jpkrause/master | Maximilian Hils | 2016-07-08 | 6 | -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 ↵ | jpkrause | 2016-07-08 | 6 | -72/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | v0.10 dump files | |||||
| * | | | | | Added flow converters for versions 0.11 and 0.12 | jpkrause | 2016-07-08 | 1 | -0/+9 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1328 from Kriechi/fix-1326 | Thomas Kriechbaumer | 2016-07-08 | 1 | -19/+26 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | http2: fix self-depended streams | |||||
| * | | | | http2: fix self-depended streams | Thomas Kriechbaumer | 2016-07-08 | 1 | -19/+26 | |
| |/ / / | ||||||
* / / / | simplify tox test exclusion | Thomas Kriechbaumer | 2016-07-08 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | fix tests | Maximilian Hils | 2016-07-07 | 1 | -0/+1 | |
| | | | ||||||
* | | | tests++ | Maximilian Hils | 2016-07-07 | 2 | -1/+16 | |
| | | | ||||||
* | | | py3++ | Maximilian Hils | 2016-07-07 | 7 | -19/+20 | |
| | | | ||||||
* | | | py3++ | Maximilian Hils | 2016-07-07 | 7 | -88/+114 | |
| | | | ||||||
* | | | reorder travis jobs | Thomas Kriechbaumer | 2016-07-07 | 1 | -7/+7 | |
| | | | ||||||
* | | | Merge pull request #1325 from Kriechi/dufferzafar-py3-h2 | Thomas Kriechbaumer | 2016-07-07 | 3 | -13/+13 | |
|\ \ \ | | | | | | | | | HTTP/2: Python 3-compatibility | |||||
| * | | | py3++ | Thomas Kriechbaumer | 2016-07-07 | 2 | -9/+9 | |
| | | | | ||||||
| * | | | py3++: test_protocol_http2 | Shadab Zafar | 2016-07-07 | 2 | -4/+4 | |
|/ / / | ||||||
* | | | py3++ | Maximilian Hils | 2016-07-07 | 4 | -4/+5 | |
| | | | ||||||
* | | | Merge pull request #1323 from mhils/test-examples | Maximilian Hils | 2016-07-07 | 3 | -1/+14 | |
|\ \ \ | | | | | | | | | Exclude harparser script on Python 3 | |||||
| * | | | disable harparser on py3 | Maximilian Hils | 2016-07-07 | 3 | -1/+14 | |
|/ / / | ||||||
* | | | Merge pull request #1318 from mhils/tnetstring3-unicode-type | Thomas Kriechbaumer | 2016-07-07 | 14 | -278/+212 | |
|\ \ \ | | | | | | | | | [tests actually pass] Add unicode to tnetstring3 | |||||
| * | | | sni is now str, not bytes | Maximilian Hils | 2016-07-06 | 10 | -43/+44 | |
| | | | | ||||||
| * | | | fix tests | Maximilian Hils | 2016-07-06 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | fix dump file cross compat between python versions | Maximilian Hils | 2016-07-06 | 2 | -32/+61 | |
| | | | | ||||||
| * | | | tnetstring3: adapt to unicode support | Maximilian Hils | 2016-07-06 | 5 | -41/+66 | |
| | | | | ||||||
| * | | | add tnetstring unicode type | Maximilian Hils | 2016-07-06 | 6 | -750/+251 | |
| | | | | ||||||
| * | | | tnetstring: keys are str on py3. migrate flow.io_compat | Maximilian Hils | 2016-07-06 | 7 | -16/+20 | |
| | | | | ||||||
| * | | | add python3 tnetstring implementation | Maximilian Hils | 2016-07-06 | 6 | -372/+746 | |
| | | | | ||||||
* | | | | Merge pull request #1322 from linrock/json-api | Maximilian Hils | 2016-07-06 | 2 | -1/+11 | |
|\ \ \ \ | |/ / / |/| | | | Detect JSON API media type as a json content view | |||||
| * | | | Detect JSON API media type as a json content view | Linmiao Xu | 2016-07-06 | 2 | -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 fixes | Maximilian Hils | 2016-07-06 | 8 | -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-issues | Maximilian Hils | 2016-07-06 | 2 | -5/+11 | |
|\ \ \ | | | | | | | | | Fix pathod log encoding | |||||
| * | | | fix pathod log encoding | Maximilian Hils | 2016-07-06 | 2 | -5/+11 | |
| | | | | ||||||
* | | | | py3++ | Maximilian Hils | 2016-07-06 | 6 | -39/+26 | |
|/ / / | ||||||
* | | | blacklist pysftp 0.2.9 | Maximilian Hils | 2016-07-06 | 1 | -1/+1 | |
| | | | | | | | | | https://bitbucket.org/dundeemt/pysftp/issues/97/pysftp-029-breaks-builds | |||||
* | | | fix issue introduced in 72f3b2b | Maximilian Hils | 2016-07-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | minor code improvement | Maximilian Hils | 2016-07-05 | 1 | -5/+6 | |
| | | | ||||||
* | | | Merge branch 'dont-cache-tox' | Maximilian Hils | 2016-07-05 | 3 | -9/+2 | |
|\ \ \ | ||||||
| * | | | don't cache tox on CI | Maximilian Hils | 2016-07-05 | 3 | -9/+2 | |
| | | | | ||||||
* | | | | Merge pull request #1315 from mitmproxy/better-unicode-handling | Maximilian Hils | 2016-07-05 | 6 | -57/+93 | |
|\ \ \ \ | |/ / / |/| | | | remove clean_bin, clarify unicode handling | |||||
| * | | | remove clean_bin, clarify unicode handling | Maximilian Hils | 2016-07-05 | 6 | -57/+93 | |
| | | | |