Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Py3: Handle bytes case in inner_repr | Shadab Zafar | 2016-05-26 | 2 | -1/+3 |
| | |||||
* | Removed wrong import | Shadab Zafar | 2016-05-26 | 1 | -0/+1 |
| | |||||
* | Py3: inner_repr and escape_unprintables | Shadab Zafar | 2016-05-26 | 1 | -2/+7 |
| | |||||
* | Py3: Import and Other misc. stuff | Shadab Zafar | 2016-05-26 | 5 | -13/+13 |
| | |||||
* | fix py3 tests | Maximilian Hils | 2016-05-25 | 1 | -1/+1 |
| | |||||
* | bytes_to_escaped_str: always escape single quotes | Maximilian Hils | 2016-05-25 | 3 | -2/+10 |
| | |||||
* | escaped_str_to_bytes: support unicode on python 2 | Maximilian Hils | 2016-05-25 | 2 | -4/+11 |
| | |||||
* | Refactor dev.sh | Aldo Cortesi | 2016-05-26 | 3 | -24/+10 |
| | | | | | | | | | | - Parameterise the Python version. All of these now work: ./dev.sh # Use default Python version ./dev.sh 2.7 # Explicitly use 2.7 in venv2.7 ./dev.sh 3.5 # Explicitly use 3.5 in venv3.5 This should also work for Travis, which has a weird setup where Pytho3 can be 3.4. | ||||
* | Merge pull request #1168 from Kriechi/venv-py3 | Aldo Cortesi | 2016-05-26 | 2 | -7/+24 |
|\ | | | | | add a py3 venv in dev environment | ||||
| * | add a py3 venv in dev environment | Thomas Kriechbaumer | 2016-05-25 | 2 | -7/+24 |
| | | | | | | | | | | This allows us to run e.g. tests in a different python version: $ venv3/bin/py.test test/netlib/test_tcp.py | ||||
* | | Update issue_template.md | Maximilian Hils | 2016-05-24 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1127 from mitmproxy/tcp-flows | Thomas Kriechbaumer | 2016-05-23 | 13 | -68/+180 |
|\ | | | | | mitmdump: Add Basic Support for TCP Flows | ||||
| * | tests++ | Maximilian Hils | 2016-05-20 | 2 | -2/+32 |
| | | |||||
| * | add FlowMaster.active_flows | Maximilian Hils | 2016-05-19 | 3 | -16/+13 |
| | | |||||
| * | tests: finish connections properly | Maximilian Hils | 2016-05-19 | 1 | -0/+1 |
| | | |||||
| * | fix tests, don't double-add error'd flows | Maximilian Hils | 2016-05-19 | 2 | -3/+3 |
| | | |||||
| * | minor fixes, adjust tests | Maximilian Hils | 2016-05-19 | 5 | -13/+13 |
| | | |||||
| * | mimtdump: add basic support for tcp flows | Maximilian Hils | 2016-05-19 | 7 | -55/+139 |
| | | |||||
* | | minor fixes (#1165) | Maximilian Hils | 2016-05-23 | 3 | -7/+2 |
| | | |||||
* | | warn users if rfile == outfile, refs #1117 | Maximilian Hils | 2016-05-21 | 1 | -0/+12 |
| | | |||||
* | | fix weight value serialization | Thomas Kriechbaumer | 2016-05-21 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #1164 from Kriechi/improve-http2 | Maximilian Hils | 2016-05-21 | 1 | -4/+22 |
|\ \ | | | | | | | Improve http2 | ||||
| * | | kill streams if connection gets terminated | Thomas Kriechbaumer | 2016-05-21 | 1 | -3/+8 |
| | | | |||||
| * | | implement transparent Priority updates | Thomas Kriechbaumer | 2016-05-21 | 1 | -0/+12 |
| | | | |||||
| * | | fix typo | Thomas Kriechbaumer | 2016-05-21 | 1 | -1/+1 |
| | | | |||||
| * | | immediately send push to client | Thomas Kriechbaumer | 2016-05-21 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'issue-1099' | Maximilian Hils | 2016-05-20 | 3 | -1/+10 |
|\ \ | |||||
| * | | fix #1099 | Maximilian Hils | 2016-05-20 | 3 | -1/+10 |
| | | | |||||
* | | | Merge branch 'mhils-multidict' | Aldo Cortesi | 2016-05-21 | 31 | -503/+883 |
|\ \ \ | |||||
| * | | | Clean un-needed imports | Aldo Cortesi | 2016-05-21 | 1 | -2/+0 |
| | | | | |||||
| * | | | A clearer implementation of MultiDictView | Aldo Cortesi | 2016-05-21 | 6 | -108/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | This makes MultiDictView work with a simple getter/setter pair, rather than using attributes with implicit leading underscores. Also move MultiDictView into multidict.py and adds some simple unit tests. | ||||
| * | | | Merge branch 'multidict' of https://github.com/mhils/mitmproxy into ↵ | Aldo Cortesi | 2016-05-21 | 31 | -502/+873 |
| |\| | | | | | | | | | | | | | | mhils-multidict | ||||
| | * | | tests++ | Maximilian Hils | 2016-05-20 | 5 | -104/+232 |
| | | | | |||||
| | * | | fix Header docs | Maximilian Hils | 2016-05-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | docs++ | Maximilian Hils | 2016-05-18 | 1 | -0/+11 |
| | | | | |||||
| | * | | improve MultiDict, add ImmutableMultiDict, adjust response.cookies | Maximilian Hils | 2016-05-18 | 15 | -324/+433 |
| | | | | |||||
| | * | | test flow export with duplicate query string | Maximilian Hils | 2016-05-18 | 4 | -3/+21 |
| | | | | |||||
| | * | | add MultiDict | Maximilian Hils | 2016-05-18 | 23 | -265/+370 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces MultiDict, a multi-dictionary similar to ODict, but with improved semantics (as in the Headers class). MultiDict fixes a few issues that were present in the Request/Response API. In particular, `request.cookies["foo"] = "bar"` has previously been a no-op, as the cookies property returned a mutable _copy_ of the cookies. | ||||
* | | | | Merge pull request #1109 from mitmproxy/faster-tls | Aldo Cortesi | 2016-05-21 | 4 | -95/+110 |
|\ \ \ \ | | | | | | | | | | | Speed up TLS handshake if SNI is present | ||||
| * | | | | fix ClientHello.__repr__ | Maximilian Hils | 2016-05-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | improve server tls handshake behaviour | Maximilian Hils | 2016-05-02 | 2 | -11/+23 |
| | | | | | |||||
| * | | | | simplify ClientHello handling | Maximilian Hils | 2016-05-02 | 2 | -25/+23 |
| | | | | | |||||
| * | | | | improve tls handling, separate `set_server` and `set_server_tls` | Maximilian Hils | 2016-05-02 | 3 | -75/+78 |
| | | | | | |||||
| * | | | | speed up TLS handshake if SNI is present | Maximilian Hils | 2016-05-02 | 1 | -4/+6 |
| | | | | | |||||
* | | | | | We don't need 3 slightly different implementations of Data | Aldo Cortesi | 2016-05-21 | 5 | -43/+11 |
| |/ / / |/| | | | |||||
* | | | | tests: silence flaky pathod test | Maximilian Hils | 2016-05-20 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | minor improvements | Maximilian Hils | 2016-05-19 | 1 | -7/+12 |
| | | | |||||
* | | | Update issue_template.md | Maximilian Hils | 2016-05-19 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1152 from mhils/cleanup-odict | Thomas Kriechbaumer | 2016-05-19 | 2 | -57/+34 |
|\ \ \ | | | | | | | | | clean up odict | ||||
| * | | | clean up odict | Maximilian Hils | 2016-05-18 | 2 | -57/+34 |
| | |/ | |/| |