Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ | |||||
* | 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 |
|/ / | |||||
* | | make dev installation instructions copy-pasteable | Maximilian Hils | 2015-08-19 | 1 | -6/+6 |
| | | |||||
* | | fix virtualenv activation | Maximilian Hils | 2015-08-19 | 1 | -1/+1 |
| | | |||||
* | | fix docs typo | Maximilian Hils | 2015-08-19 | 1 | -2/+2 |
| | | | | | | refs mitmproxy/mitmproxy.org#7 | ||||
* | | Merge pull request #732 from FreeArtMan/master | Thomas Kriechbaumer | 2015-08-19 | 1 | -1/+3 |
|\ \ | | | | | | | Fixing issue #710. Prety printing in read_dumpfile | ||||
| * | | Fixing issue #710. Prety printing in read_dumpfile | FreeArtMan | 2015-08-19 | 1 | -1/+3 |
|/ / | |||||
* | | temporarily disable pypy with new openssl on travis | Thomas Kriechbaumer | 2015-08-18 | 1 | -10/+10 |
| | | |||||
* | | temporarily disable pypy on travis | Thomas Kriechbaumer | 2015-08-18 | 1 | -1/+1 |
| | | |||||
* | | Small tweaks to read_dumpfile example. | Aldo Cortesi | 2015-08-17 | 1 | -1/+1 |
| | | |||||
* | | Disable mitmweb OSX binary generation for now | Aldo Cortesi | 2015-08-16 | 1 | -0/+0 |
| | | |||||
* | | Adapt mitmdump and mitmweb for certifi and release process | Aldo Cortesi | 2015-08-16 | 2 | -12/+22 |
| | | |||||
* | | Adapt mitmproxy.spec for new cryptography, certifi and new release structure | Aldo Cortesi | 2015-08-16 | 1 | -6/+11 |
| | | |||||
* | | Remove release tools | Aldo Cortesi | 2015-08-16 | 5 | -402/+0 |
| | | |||||
| * | minor fixes | Maximilian Hils | 2015-08-30 | 2 | -4/+5 |
| | | |||||
| * | always insert tls layer for inline script upgrades | Maximilian Hils | 2015-08-30 | 9 | -39/+49 |
| | | |||||
| * | restructure code, remove cruft | Maximilian Hils | 2015-08-30 | 22 | -846/+250 |
| | | |||||
| * | simplify raw tcp protocol | Maximilian Hils | 2015-08-29 | 1 | -8/+54 |
| | | |||||
| * | fix bugs, fix tests | Maximilian Hils | 2015-08-29 | 5 | -85/+69 |
| | | |||||
| * | fix streaming | Maximilian Hils | 2015-08-29 | 2 | -72/+124 |
| | | |||||
| * | move sslversion mapping to netlib | Maximilian Hils | 2015-08-29 | 2 | -24/+6 |
| | | |||||
| * | clean up config/cmdline, fix bugs, remove cruft | Maximilian Hils | 2015-08-28 | 15 | -345/+303 |
| | | |||||
| * | Revert "unify SSL version/method handling" | Maximilian Hils | 2015-08-27 | 1 | -25/+44 |
| | | | | | | | | This reverts commit 14e49f4fc7a38b63099ab0d42afd213b0d567c0f. | ||||
| * | start fixing proxy config | Maximilian Hils | 2015-08-27 | 1 | -42/+6 |
| | |