aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* http2: fix unhandled framesThomas Kriechbaumer2015-09-031-8/+8
|
* Merge pull request #748 from Kriechi/tls-ciphersMaximilian Hils2015-09-031-2/+202
|\ | | | | pass-through ciphers from client to server
| * pass-through ciphers from client to serverThomas Kriechbaumer2015-09-021-2/+202
| |
* | Merge pull request #749 from Kriechi/ignore-priority-framesMaximilian Hils2015-09-031-8/+35
|\ \ | |/ |/| ignore http2 priority frames
| * http2: improve unexpected frame handling and shutdownThomas Kriechbaumer2015-09-031-14/+34
| |
| * ignore http2 priority framesThomas Kriechbaumer2015-09-021-1/+8
|/
* Merge pull request #741 from mitmproxy/proxy-refactor-cbMaximilian Hils2015-09-0255-2412/+2620
|\ | | | | Proxy Refactor
| * better tls error messages, fix #672Maximilian Hils2015-09-011-2/+10
| |
| * Merge branch 'master' into proxy-refactor-cbMaximilian Hils2015-09-011-3/+4
| |\ | |/ |/|
* | .env: fix windows compatibilityMaximilian Hils2015-09-011-3/+4
| |
| * Merge branch 'proxy-refactor-cb' of https://github.com/mitmproxy/mitmproxy ↵Maximilian Hils2015-09-011-2/+10
| |\ | | | | | | | | | into proxy-refactor-cb
| | * Merge pull request #744 from Kriechi/proxy-refactor-cbMaximilian Hils2015-08-311-2/+10
| | |\ | | | | | | | | do not log WindowUpdateFrame frames
| | | * do not log WindowUpdateFrame framesThomas Kriechbaumer2015-08-311-2/+10
| | |/
| * / minor docs improvementsMaximilian Hils2015-09-011-4/+4
| |/
| * we don't support socks auth, refs #738Maximilian Hils2015-08-312-0/+10
| |
| * update inline script hooksMaximilian Hils2015-08-318-15/+38
| |
| * fix layer initializationMaximilian Hils2015-08-311-1/+1
| |
| * fix dns_spoofing example, avoid connecting to itselfMaximilian Hils2015-08-317-22/+55
| |
| * fix upstream proxy server change, update exampleMaximilian Hils2015-08-314-35/+45
| |
| * coverage++Maximilian Hils2015-08-304-6/+10
| |
| * move files aroundMaximilian Hils2015-08-3031-866/+884
| |
| * remove http2http referencesMaximilian Hils2015-08-306-22/+17
| |
| * remove old codeMaximilian Hils2015-08-307-917/+22
| |
| * Merge remote-tracking branch 'origin/master' into proxy-refactor-cbMaximilian Hils2015-08-3016-446/+66
| |\ | |/ |/|
* | improve travisMaximilian Hils2015-08-271-21/+20
| |
* | Merge pull request #735 from ender672/disable-mouse-optionMaximilian Hils2015-08-273-2/+9
|\ \ | | | | | | console: add command line flag to disable mouse interaction
| * | console: add command line flag to disable mouse interactionTimothy Elliott2015-08-193-2/+9
| | | | | | | | | | | | | | | | | | Adds the --no-mouse command line option to disable the mouse. Fixes #685
* | | update slackin urlMaximilian Hils2015-08-251-2/+1
|/ /
* | make dev installation instructions copy-pasteableMaximilian Hils2015-08-191-6/+6
| |
* | fix virtualenv activationMaximilian Hils2015-08-191-1/+1
| |
* | fix docs typoMaximilian Hils2015-08-191-2/+2
| | | | | | refs mitmproxy/mitmproxy.org#7
* | Merge pull request #732 from FreeArtMan/masterThomas Kriechbaumer2015-08-191-1/+3
|\ \ | | | | | | Fixing issue #710. Prety printing in read_dumpfile
| * | Fixing issue #710. Prety printing in read_dumpfileFreeArtMan2015-08-191-1/+3
|/ /
* | temporarily disable pypy with new openssl on travisThomas Kriechbaumer2015-08-181-10/+10
| |
* | temporarily disable pypy on travisThomas Kriechbaumer2015-08-181-1/+1
| |
* | Small tweaks to read_dumpfile example.Aldo Cortesi2015-08-171-1/+1
| |
* | Disable mitmweb OSX binary generation for nowAldo Cortesi2015-08-161-0/+0
| |
* | Adapt mitmdump and mitmweb for certifi and release processAldo Cortesi2015-08-162-12/+22
| |
* | Adapt mitmproxy.spec for new cryptography, certifi and new release structureAldo Cortesi2015-08-161-6/+11
| |
* | Remove release toolsAldo Cortesi2015-08-165-402/+0
| |
| * minor fixesMaximilian Hils2015-08-302-4/+5
| |
| * always insert tls layer for inline script upgradesMaximilian Hils2015-08-309-39/+49
| |
| * restructure code, remove cruftMaximilian Hils2015-08-3022-846/+250
| |
| * simplify raw tcp protocolMaximilian Hils2015-08-291-8/+54
| |
| * fix bugs, fix testsMaximilian Hils2015-08-295-85/+69
| |
| * fix streamingMaximilian Hils2015-08-292-72/+124
| |
| * move sslversion mapping to netlibMaximilian Hils2015-08-292-24/+6
| |
| * clean up config/cmdline, fix bugs, remove cruftMaximilian Hils2015-08-2815-345/+303
| |
| * Revert "unify SSL version/method handling"Maximilian Hils2015-08-271-25/+44
| | | | | | | | This reverts commit 14e49f4fc7a38b63099ab0d42afd213b0d567c0f.
| * start fixing proxy configMaximilian Hils2015-08-271-42/+6
| |