aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into readthedocsMaximilian Hils2015-09-0622-252/+229
|\
| * 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
* | docs++Maximilian Hils2015-09-0611-11/+210
* | finish tools sectionMaximilian Hils2015-09-052-2/+83
* | docs++Maximilian Hils2015-09-0510-9/+211
* | doc: headers classMaximilian Hils2015-09-051-1/+6
* | rewrite basic docs for readthedocsMaximilian Hils2015-09-0462-29/+828
* | Merge branch 'master' into readthedocsMaximilian Hils2015-09-0410-34/+19
|\|
| * 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, docs, docs!Maximilian Hils2015-09-049-19/+254
* | add dev docsMaximilian Hils2015-09-037-0/+470
|/
* 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
| * 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
|\ \