Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | add inline script for conditional tls passthrough | Maximilian Hils | 2015-09-08 | 2 | -0/+140 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | fix #646 | |||||
* | | | | | whitelist next_layer for @concurrent | Maximilian Hils | 2015-09-07 | 2 | -4/+11 | |
| | | | | | ||||||
* | | | | | expose `next_layer` to inline scripts | Maximilian Hils | 2015-09-07 | 6 | -23/+33 | |
| |_|_|/ |/| | | | ||||||
* | | | | fix tests | Maximilian Hils | 2015-09-05 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | adjust to new netlib Headers class | Maximilian Hils | 2015-09-05 | 22 | -242/+224 | |
| | | | | ||||||
* | | | | speed up filters | Maximilian Hils | 2015-09-04 | 2 | -14/+9 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-09-04 | 1 | -8/+0 | |
|\ \ \ | ||||||
| * | | | http2: Ping frames are handled in netlib | Thomas Kriechbaumer | 2015-09-03 | 1 | -8/+0 | |
| | |/ | |/| | ||||||
* / | | update example inline scripts | Maximilian Hils | 2015-09-04 | 9 | -26/+19 | |
|/ / | ||||||
* | | docs++ | Maximilian Hils | 2015-09-03 | 5 | -53/+127 | |
| | | ||||||
* | | remove depth attribute from set_server | Maximilian Hils | 2015-09-03 | 4 | -39/+36 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-09-03 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | http2: fix ping response | Thomas Kriechbaumer | 2015-09-03 | 1 | -2/+2 | |
| | | | ||||||
* | | | remove ServerConnectionMixin.reconnect | Maximilian Hils | 2015-09-03 | 13 | -62/+48 | |
|/ / | ||||||
* | | http2: server can send WindowUpdate frames as well | Thomas Kriechbaumer | 2015-09-03 | 1 | -2/+9 | |
| | | ||||||
* | | http2: add GoAway support for client | Thomas Kriechbaumer | 2015-09-03 | 1 | -0/+5 | |
| | | ||||||
* | | http2: fix PingFrame again | Thomas Kriechbaumer | 2015-09-03 | 1 | -2/+2 | |
| | | ||||||
* | | http2: fix multiple stream per connection | Thomas Kriechbaumer | 2015-09-03 | 1 | -30/+30 | |
| | | | | | | | | fixes #746 | |||||
* | | http2: fix unhandled frames | Thomas Kriechbaumer | 2015-09-03 | 1 | -8/+8 | |
| | | ||||||
* | | Merge pull request #748 from Kriechi/tls-ciphers | Maximilian Hils | 2015-09-03 | 1 | -2/+202 | |
|\ \ | | | | | | | pass-through ciphers from client to server | |||||
| * | | pass-through ciphers from client to server | Thomas Kriechbaumer | 2015-09-02 | 1 | -2/+202 | |
| | | | ||||||
* | | | Merge pull request #749 from Kriechi/ignore-priority-frames | Maximilian Hils | 2015-09-03 | 1 | -8/+35 | |
|\ \ \ | |/ / |/| | | ignore http2 priority frames | |||||
| * | | http2: improve unexpected frame handling and shutdown | Thomas Kriechbaumer | 2015-09-03 | 1 | -14/+34 | |
| | | | ||||||
| * | | ignore http2 priority frames | Thomas Kriechbaumer | 2015-09-02 | 1 | -1/+8 | |
|/ / | ||||||
| * | remove urwid from contentviews | Maximilian Hils | 2015-09-04 | 1 | -57/+48 | |
| | | ||||||
| * | remove urwid from contentviews (wip) | Maximilian Hils | 2015-09-04 | 1 | -55/+89 | |
| | | ||||||
| * | fix circular imports | Maximilian Hils | 2015-09-02 | 2 | -10/+19 | |
| | | ||||||
| * | PR #700 | Chris Czub | 2015-09-02 | 5 | -8/+14 | |
|/ | | | | | Start moving the contentview up a level Started shifting the contentview class up to libmproxy | |||||
* | Merge pull request #741 from mitmproxy/proxy-refactor-cb | Maximilian Hils | 2015-09-02 | 55 | -2412/+2620 | |
|\ | | | | | Proxy Refactor | |||||
| * | better tls error messages, fix #672 | Maximilian Hils | 2015-09-01 | 1 | -2/+10 | |
| | | ||||||
| * | Merge branch 'master' into proxy-refactor-cb | Maximilian Hils | 2015-09-01 | 1 | -3/+4 | |
| |\ | |/ |/| | ||||||
* | | .env: fix windows compatibility | Maximilian Hils | 2015-09-01 | 1 | -3/+4 | |
| | | ||||||
| * | Merge branch 'proxy-refactor-cb' of https://github.com/mitmproxy/mitmproxy ↵ | Maximilian Hils | 2015-09-01 | 1 | -2/+10 | |
| |\ | | | | | | | | | | into proxy-refactor-cb | |||||
| | * | Merge pull request #744 from Kriechi/proxy-refactor-cb | Maximilian Hils | 2015-08-31 | 1 | -2/+10 | |
| | |\ | | | | | | | | | do not log WindowUpdateFrame frames | |||||
| | | * | do not log WindowUpdateFrame frames | Thomas Kriechbaumer | 2015-08-31 | 1 | -2/+10 | |
| | |/ | ||||||
| * / | minor docs improvements | Maximilian Hils | 2015-09-01 | 1 | -4/+4 | |
| |/ | ||||||
| * | we don't support socks auth, refs #738 | Maximilian Hils | 2015-08-31 | 2 | -0/+10 | |
| | | ||||||
| * | update inline script hooks | Maximilian Hils | 2015-08-31 | 8 | -15/+38 | |
| | | ||||||
| * | fix layer initialization | Maximilian Hils | 2015-08-31 | 1 | -1/+1 | |
| | | ||||||
| * | fix dns_spoofing example, avoid connecting to itself | Maximilian Hils | 2015-08-31 | 7 | -22/+55 | |
| | | ||||||
| * | fix upstream proxy server change, update example | Maximilian Hils | 2015-08-31 | 4 | -35/+45 | |
| | | ||||||
| * | coverage++ | Maximilian Hils | 2015-08-30 | 4 | -6/+10 | |
| | | ||||||
| * | move files around | Maximilian Hils | 2015-08-30 | 31 | -866/+884 | |
| | | ||||||
| * | remove http2http references | Maximilian Hils | 2015-08-30 | 6 | -22/+17 | |
| | | ||||||
| * | remove old code | Maximilian Hils | 2015-08-30 | 7 | -917/+22 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/master' into proxy-refactor-cb | Maximilian Hils | 2015-08-30 | 16 | -446/+66 | |
| |\ | |/ |/| | ||||||
* | | improve travis | Maximilian Hils | 2015-08-27 | 1 | -21/+20 | |
| | | ||||||
* | | Merge pull request #735 from ender672/disable-mouse-option | Maximilian Hils | 2015-08-27 | 3 | -2/+9 | |
|\ \ | | | | | | | console: add command line flag to disable mouse interaction | |||||
| * | | console: add command line flag to disable mouse interaction | Timothy Elliott | 2015-08-19 | 3 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | Adds the --no-mouse command line option to disable the mouse. Fixes #685 | |||||
* | | | update slackin url | Maximilian Hils | 2015-08-25 | 1 | -2/+1 | |
|/ / |