aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed wrong importShadab Zafar2016-05-261-0/+1
|
* Py3: inner_repr and escape_unprintablesShadab Zafar2016-05-261-2/+7
|
* Py3: Import and Other misc. stuffShadab Zafar2016-05-265-13/+13
|
* fix py3 testsMaximilian Hils2016-05-251-1/+1
|
* bytes_to_escaped_str: always escape single quotesMaximilian Hils2016-05-253-2/+10
|
* escaped_str_to_bytes: support unicode on python 2Maximilian Hils2016-05-252-4/+11
|
* Refactor dev.shAldo Cortesi2016-05-263-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-py3Aldo Cortesi2016-05-262-7/+24
|\ | | | | add a py3 venv in dev environment
| * add a py3 venv in dev environmentThomas Kriechbaumer2016-05-252-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.mdMaximilian Hils2016-05-241-0/+1
|/
* Merge pull request #1127 from mitmproxy/tcp-flowsThomas Kriechbaumer2016-05-2313-68/+180
|\ | | | | mitmdump: Add Basic Support for TCP Flows
| * tests++Maximilian Hils2016-05-202-2/+32
| |
| * add FlowMaster.active_flowsMaximilian Hils2016-05-193-16/+13
| |
| * tests: finish connections properlyMaximilian Hils2016-05-191-0/+1
| |
| * fix tests, don't double-add error'd flowsMaximilian Hils2016-05-192-3/+3
| |
| * minor fixes, adjust testsMaximilian Hils2016-05-195-13/+13
| |
| * mimtdump: add basic support for tcp flowsMaximilian Hils2016-05-197-55/+139
| |
* | minor fixes (#1165)Maximilian Hils2016-05-233-7/+2
| |
* | warn users if rfile == outfile, refs #1117Maximilian Hils2016-05-211-0/+12
| |
* | fix weight value serializationThomas Kriechbaumer2016-05-211-1/+2
| |
* | Merge pull request #1164 from Kriechi/improve-http2Maximilian Hils2016-05-211-4/+22
|\ \ | | | | | | Improve http2
| * | kill streams if connection gets terminatedThomas Kriechbaumer2016-05-211-3/+8
| | |
| * | implement transparent Priority updatesThomas Kriechbaumer2016-05-211-0/+12
| | |
| * | fix typoThomas Kriechbaumer2016-05-211-1/+1
| | |
| * | immediately send push to clientThomas Kriechbaumer2016-05-211-0/+1
| |/
* | Merge branch 'issue-1099'Maximilian Hils2016-05-203-1/+10
|\ \
| * | fix #1099Maximilian Hils2016-05-203-1/+10
| | |
* | | Merge branch 'mhils-multidict'Aldo Cortesi2016-05-2131-503/+883
|\ \ \
| * | | Clean un-needed importsAldo Cortesi2016-05-211-2/+0
| | | |
| * | | A clearer implementation of MultiDictViewAldo Cortesi2016-05-216-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 Cortesi2016-05-2131-502/+873
| |\| | | | | | | | | | | | | | mhils-multidict
| | * | tests++Maximilian Hils2016-05-205-104/+232
| | | |
| | * | fix Header docsMaximilian Hils2016-05-201-3/+3
| | | |
| | * | docs++Maximilian Hils2016-05-181-0/+11
| | | |
| | * | improve MultiDict, add ImmutableMultiDict, adjust response.cookiesMaximilian Hils2016-05-1815-324/+433
| | | |
| | * | test flow export with duplicate query stringMaximilian Hils2016-05-184-3/+21
| | | |
| | * | add MultiDictMaximilian Hils2016-05-1823-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-tlsAldo Cortesi2016-05-214-95/+110
|\ \ \ \ | | | | | | | | | | Speed up TLS handshake if SNI is present
| * | | | fix ClientHello.__repr__Maximilian Hils2016-05-021-1/+1
| | | | |
| * | | | improve server tls handshake behaviourMaximilian Hils2016-05-022-11/+23
| | | | |
| * | | | simplify ClientHello handlingMaximilian Hils2016-05-022-25/+23
| | | | |
| * | | | improve tls handling, separate `set_server` and `set_server_tls`Maximilian Hils2016-05-023-75/+78
| | | | |
| * | | | speed up TLS handshake if SNI is presentMaximilian Hils2016-05-021-4/+6
| | | | |
* | | | | We don't need 3 slightly different implementations of DataAldo Cortesi2016-05-215-43/+11
| |/ / / |/| | |
* | | | tests: silence flaky pathod testMaximilian Hils2016-05-201-0/+1
| |_|/ |/| |
* | | minor improvementsMaximilian Hils2016-05-191-7/+12
| | |
* | | Update issue_template.mdMaximilian Hils2016-05-191-2/+2
| | |
* | | Merge pull request #1152 from mhils/cleanup-odictThomas Kriechbaumer2016-05-192-57/+34
|\ \ \ | | | | | | | | clean up odict
| * | | clean up odictMaximilian Hils2016-05-182-57/+34
| | |/ | |/|
* | | tests: properly skip pathod testsMaximilian Hils2016-05-182-4/+4
| | |