aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* better error messages, remove error causeMaximilian Hils2015-09-118-19/+38
* tls layer: fix early peekMaximilian Hils2015-09-111-1/+1
* better exception handlingMaximilian Hils2015-09-115-17/+58
* fix chunked encodingMaximilian Hils2015-09-112-10/+16
* nicer error messagesMaximilian Hils2015-09-111-1/+1
* polish for release: introduce http2 and rawtcp as command line switchesMaximilian Hils2015-09-115-23/+57
* fix exception re-raiseMaximilian Hils2015-09-101-1/+1
* start reraising exceptions properlyMaximilian Hils2015-09-101-3/+5
* raw tcp mode: use ssl_read_selectMaximilian Hils2015-09-101-2/+2
* fix send_response if content is missingMaximilian Hils2015-09-101-0/+2
* inline scripts: provide __file__Maximilian Hils2015-09-101-1/+1
* simplify streaming http layerMaximilian Hils2015-09-101-11/+11
* http protocol: use new tls attributeMaximilian Hils2015-09-091-1/+1
* add inline script for conditional tls passthroughMaximilian Hils2015-09-082-0/+140
* whitelist next_layer for @concurrentMaximilian Hils2015-09-072-4/+11
* expose `next_layer` to inline scriptsMaximilian Hils2015-09-076-23/+33
* fix testsMaximilian Hils2015-09-051-4/+4
* adjust to new netlib Headers classMaximilian Hils2015-09-0522-242/+224
* speed up filtersMaximilian Hils2015-09-042-14/+9
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-09-041-8/+0
|\
| * http2: Ping frames are handled in netlibThomas Kriechbaumer2015-09-031-8/+0
* | update example inline scriptsMaximilian Hils2015-09-049-26/+19
|/
* docs++Maximilian Hils2015-09-035-53/+127
* remove depth attribute from set_serverMaximilian Hils2015-09-034-39/+36
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2015-09-031-2/+2
|\
| * http2: fix ping responseThomas Kriechbaumer2015-09-031-2/+2
* | remove ServerConnectionMixin.reconnectMaximilian Hils2015-09-0313-62/+48
|/
* http2: server can send WindowUpdate frames as wellThomas Kriechbaumer2015-09-031-2/+9
* http2: add GoAway support for clientThomas Kriechbaumer2015-09-031-0/+5
* http2: fix PingFrame againThomas Kriechbaumer2015-09-031-2/+2
* http2: fix multiple stream per connectionThomas Kriechbaumer2015-09-031-30/+30
* 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 serverThomas Kriechbaumer2015-09-021-2/+202
* | Merge pull request #749 from Kriechi/ignore-priority-framesMaximilian Hils2015-09-031-8/+35
|\ \ | |/ |/|
| * 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
|\
| * 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 in...Maximilian Hils2015-09-011-2/+10
| |\
| | * Merge pull request #744 from Kriechi/proxy-refactor-cbMaximilian Hils2015-08-311-2/+10
| | |\
| | | * 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