Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | workaround for RTD issue rtfd/readthedocs.org#152 | Maximilian Hils | 2016-02-11 | 1 | -1/+1 |
* | fix #823 | Maximilian Hils | 2016-02-10 | 3 | -3/+13 |
* | relax dependencies for enum34, fix #924 | Maximilian Hils | 2016-02-10 | 1 | -1/+1 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-10 | 3 | -50/+229 |
|\ | |||||
| * | Merge pull request #916 from dufferzafar/export-code | Maximilian Hils | 2016-02-10 | 3 | -50/+229 |
| |\ | |||||
| | * | Use textwrap.dedent in flow_export.python_code too | Shadab Zafar | 2016-02-10 | 1 | -10/+13 |
| | * | Use classes to test a command, move code to separate methods under | Shadab Zafar | 2016-02-09 | 1 | -114/+126 |
| | * | Use textwrap.dedent to improve readability of tests | Shadab Zafar | 2016-02-09 | 1 | -51/+82 |
| | * | Rename test_export_flow.py to test_flow_export.py | Shadab Zafar | 2016-02-09 | 1 | -0/+0 |
| | * | Fix content length header issues | Shadab Zafar | 2016-02-08 | 1 | -2/+6 |
| | * | Tests for flow_export.raw_request | Shadab Zafar | 2016-02-08 | 1 | -1/+23 |
| | * | Tests for flow_export.python_code | Shadab Zafar | 2016-02-08 | 1 | -0/+46 |
| | * | Test exact return value of flow_export.curl_command | Shadab Zafar | 2016-02-08 | 1 | -4/+15 |
| | * | Add some basic tests for flow_exports | Shadab Zafar | 2016-02-08 | 1 | -0/+22 |
| | * | Move exporters to a separate file | Shadab Zafar | 2016-02-08 | 2 | -76/+78 |
| | * | Export any flow as Python code, not just GET | Shadab Zafar | 2016-02-06 | 1 | -5/+19 |
| | * | Refactor copy_as_python_code | Shadab Zafar | 2016-02-06 | 1 | -13/+25 |
* | | | fix #925 | Maximilian Hils | 2016-02-10 | 1 | -6/+10 |
|/ / | |||||
* | | fix syntax | Thomas Kriechbaumer | 2016-02-08 | 1 | -1/+2 |
* | | fix #920 | Thomas Kriechbaumer | 2016-02-08 | 1 | -0/+19 |
* | | Merge pull request #921 from mitmproxy/model-cleanup | Thomas Kriechbaumer | 2016-02-08 | 10 | -182/+146 |
|\ \ | |||||
| * | | make stateobject simpler and stricter | Maximilian Hils | 2016-02-08 | 8 | -111/+87 |
| * | | simplify state management | Maximilian Hils | 2016-02-08 | 8 | -90/+78 |
|/ / | |||||
* | | remove duplicate code | Maximilian Hils | 2016-02-08 | 1 | -27/+0 |
* | | fix #876 | Maximilian Hils | 2016-02-08 | 2 | -4/+11 |
* | | http2: indicate http version in the ui | Maximilian Hils | 2016-02-08 | 2 | -3/+12 |
* | | http2: fix http_version | Maximilian Hils | 2016-02-08 | 1 | -2/+2 |
* | | raise error if --http2 is specified, but the OpenSSL version doesn't support it | Maximilian Hils | 2016-02-08 | 2 | -0/+8 |
* | | removed unused parameter | Maximilian Hils | 2016-02-08 | 2 | -6/+3 |
* | | update dependencies | Maximilian Hils | 2016-02-06 | 1 | -2/+2 |
* | | do not include 'test' as package | Maximilian Hils | 2016-02-06 | 1 | -1/+1 |
* | | update dependencies | Maximilian Hils | 2016-02-05 | 1 | -1/+1 |
* | | Merge pull request #917 from mitmproxy/not-so-modern-setuptools | Thomas Kriechbaumer | 2016-02-05 | 2 | -33/+36 |
|\ \ | |||||
| * | | remove compatible version specifiers | Maximilian Hils | 2016-02-05 | 2 | -33/+36 |
|/ / | |||||
* | | Merge pull request #914 from mitmproxy/modern-setuptools | Maximilian Hils | 2016-02-04 | 2 | -72/+60 |
|\ \ | |||||
| * | | make sure that we don't get bitten by upstream | Maximilian Hils | 2016-02-04 | 1 | -31/+31 |
| * | | always install urwid | Maximilian Hils | 2016-02-04 | 1 | -1/+1 |
| * | | setup.py: no range operators for env markers | Maximilian Hils | 2016-02-04 | 1 | -1/+3 |
| * | | simplify setup.py | Maximilian Hils | 2016-02-04 | 2 | -72/+58 |
|/ / | |||||
* | | always add common name as subjectAltName | Maximilian Hils | 2016-02-04 | 1 | -1/+3 |
* | | Merge pull request #883 from mitmproxy/hyper-h2 | Thomas Kriechbaumer | 2016-02-04 | 18 | -271/+1004 |
|\ \ | |/ |/| | |||||
| * | travis: cache wheels on osx, allow pypy failures | Maximilian Hils | 2016-02-04 | 1 | -0/+3 |
| * | remove debug output | Maximilian Hils | 2016-02-04 | 1 | -4/+1 |
| * | fix travis caching | Maximilian Hils | 2016-02-04 | 1 | -10/+0 |
| * | fix import | Maximilian Hils | 2016-02-04 | 1 | -1/+0 |
| * | check for channel error location | Maximilian Hils | 2016-02-04 | 1 | -0/+4 |
| * | fix http2 race condition | Thomas Kriechbaumer | 2016-02-04 | 2 | -26/+107 |
| * | cleanup | Thomas Kriechbaumer | 2016-02-04 | 2 | -8/+8 |
| * | do not send RST if there is not upstream stream openend yet | Maximilian Hils | 2016-02-04 | 1 | -1/+2 |
| * | add comment that explains OrderedDict use | Maximilian Hils | 2016-02-04 | 1 | -0/+4 |