Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |/ | |/| | |||||
* | | | tests: properly skip pathod tests | Maximilian Hils | 2016-05-18 | 2 | -4/+4 |
| | | | |||||
* | | | display response reason in ui | Maximilian Hils | 2016-05-18 | 1 | -3/+5 |
|/ / | |||||
* | | tests: xfail -> skip | Maximilian Hils | 2016-05-18 | 1 | -3/+3 |
| | | |||||
* | | remove debug print | Thomas Kriechbaumer | 2016-05-17 | 1 | -1/+0 |
| | | |||||
* | | http2: cleanup | Thomas Kriechbaumer | 2016-05-17 | 1 | -22/+25 |
| | | |||||
* | | Merge pull request #1126 from Kriechi/safeguard | Maximilian Hils | 2016-05-17 | 4 | -13/+85 |
|\ \ | | | | | | | Safeguard | ||||
| * | | http2: properly handle connection errors | Thomas Kriechbaumer | 2016-05-17 | 3 | -13/+37 |
| | | | |||||
| * | | http2: add connection-lost test | Thomas Kriechbaumer | 2016-05-17 | 1 | -0/+48 |
|/ / | |||||
* | | Fix broken test_flow_export tests | Aldo Cortesi | 2016-05-18 | 1 | -34/+27 |
| | | | | | | | | | | | | | | - Make the tests safe for concurrency - Fix a test that only passed due to prior modification of global state This also fixes the project generally for parallel test execution. | ||||
* | | Clean up flow export tests | Aldo Cortesi | 2016-05-18 | 11 | -262/+242 |
| | | | | | | | | | | - Externalise test data - Define a less finicky comparator for Python code | ||||
* | | Updated the docstring (#1150) | Yoginski | 2016-05-17 | 1 | -1/+1 |
| | | |||||
* | | fix encoding error on *too* random bytes | Thomas Kriechbaumer | 2016-05-15 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix things like: def __init__(self, val): self.val = val.decode("string_escape") ValueError: Trailing \ in string pathod/language/base.py:108: ValueError test/pathod/test_language_websocket.py:83: in fr return netlib.websockets.Frame.from_bytes(tutils.render(wf, settings)) test/pathod/tutils.py:123: in render r = r.resolve(settings) pathod/language/websockets.py:179: in resolve Key(base.TokValueLiteral(os.urandom(4))) | ||||
* | | fix naming which caused overwriting of functions | Thomas Kriechbaumer | 2016-05-15 | 1 | -1/+1 |
| | | |||||
* | | http2: improve header tests (#1143) (#1144) | Thomas Kriechbaumer | 2016-05-14 | 1 | -6/+11 |
| | | |||||
* | | Fixed HTTP2 headers being folded. (#1143) (#1144) | Kostya Esmukov | 2016-05-14 | 1 | -1/+1 |
| | | |||||
* | | added UI for options menu (#1130) | Clemens Brunner | 2016-05-14 | 6 | -425/+692 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added UI for options menu * update UI for options menu * update UI for options v2 * update UI for options v2 * added new btn class * little changes * little changes * merge * deleted branch * change menu button class | ||||
* | | showing url for terminals that support clickable links when starting mitmweb ↵ | Jonathan Jones | 2016-05-14 | 1 | -0/+2 |
| | | | | | | | | (#1141) | ||||
* | | bump python-hyper dependencies (#1139) | Thomas Kriechbaumer | 2016-05-12 | 1 | -3/+2 |
| | | |||||
* | | Sanitize Print (#1135) | Maximilian Hils | 2016-05-12 | 3 | -9/+52 |
| | | | | | | | | | | | | | | | | * sanitize strings with shell control characters * netlib: add utilities to safe-print bytes * escaped str: add TODO for multi-byte chars | ||||
* | | Merge pull request #1137 from Kriechi/h2-header-encoding | Thomas Kriechbaumer | 2016-05-11 | 2 | -6/+10 |
|\ \ | | | | | | | disable http2 header encoding, use bytes everywhere | ||||
| * | | disable http2 header encoding, use bytes everywhere | Thomas Kriechbaumer | 2016-05-11 | 2 | -6/+10 |
| | | | |||||
* | | | Adding example which turns every reponse into an HTTP 500. (#1136) | Jason Pepas | 2016-05-11 | 2 | -0/+4 |
|/ / | | | | | | | | | | | * Adding example which turns every reponse into an HTTP 500. * Prefer b"" over None for response.content. | ||||
* | | Merge pull request #1134 from mhils/fix-versions | Thomas Kriechbaumer | 2016-05-11 | 2 | -2/+8 |
|\ \ | | | | | | | Fix `version.NAME` | ||||
| * | | fix version.NAME | Maximilian Hils | 2016-05-11 | 2 | -2/+8 |
| | | | |||||
* | | | Merge pull request #1121 from Kriechi/fix-cookies | Thomas Kriechbaumer | 2016-05-11 | 9 | -61/+71 |
|\ \ \ | | | | | | | | | improve cookie parsing | ||||
| * | | | replace SimpleCookie with our own parser lib | Thomas Kriechbaumer | 2016-05-11 | 3 | -16/+35 |
| | | | |