| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add whitespace to improve url parsing | Thomas Kriechbaumer | 2016-07-09 | 1 | -1/+1 |
| | | |||||
| * | fix pip install on osx travis | Thomas Kriechbaumer | 2016-07-09 | 1 | -1/+1 |
| | | |||||
| * | upgrade pip on osx travis | Thomas Kriechbaumer | 2016-07-09 | 2 | -1/+3 |
| | | |||||
| * | try to fix weird install behaviour | Thomas Kriechbaumer | 2016-07-09 | 1 | -2/+2 |
| | | |||||
| * | update osx travis | Thomas Kriechbaumer | 2016-07-09 | 1 | -10/+7 |
| | | |||||
| * | cleanup tox | Thomas Kriechbaumer | 2016-07-09 | 1 | -5/+3 |
| | | |||||
| * | Merge pull request #1334 from mhils/cleanup | Thomas Kriechbaumer | 2016-07-09 | 3 | -7/+0 |
| |\ | | | | | Remove unused files | ||||
| | * | remove unused files | Maximilian Hils | 2016-07-09 | 3 | -7/+0 |
| |/ | |||||
| * | Update README.rst | Maximilian Hils | 2016-07-09 | 1 | -3/+2 |
| | | |||||
| * | Add Python 3.5 markers to setup.py | Maximilian Hils | 2016-07-09 | 1 | -0/+2 |
| | | |||||
| * | remove pathod doc leftovers | Maximilian Hils | 2016-07-09 | 3 | -384/+0 |
| | | |||||
| * | Merge pull request #1299 from dufferzafar/py3-dump | Thomas Kriechbaumer | 2016-07-09 | 6 | -33/+47 |
| |\ | | | | | Python 3 - test_dump | ||||
| | * | Make escape_control_characters handle strings on Py2 | Shadab Zafar | 2016-07-09 | 2 | -4/+5 |
| | | | |||||
| | * | 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 |
| | | | |||||
