aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* more style cleanupThomas Kriechbaumer2016-05-292-13/+23
* more style cleanupThomas Kriechbaumer2016-05-293-2/+10
* more style cleanupThomas Kriechbaumer2016-05-292-4/+5
* fix docs typoMaximilian Hils2016-05-294-520/+0
* controller.ControlError -> exceptions.ControlExceptionAldo Cortesi2016-05-292-12/+11
* Add some comments to controller wrapper.Aldo Cortesi2016-05-291-0/+5
* Adapt examplesAldo Cortesi2016-05-291-7/+9
* handle_* -> *Aldo Cortesi2016-05-296-42/+46
* Explicitly list all eventsAldo Cortesi2016-05-291-0/+23
* Flatten ServerMaster into MasterAldo Cortesi2016-05-292-33/+9
* Merge branch 'master' into solidcoreAldo Cortesi2016-05-2915-28/+41
|\
| * mitmproxy: fix most flake8 offensesThomas Kriechbaumer2016-05-2812-19/+36
| * cleanup imports with flake8Thomas Kriechbaumer2016-05-284-9/+5
* | Be stricter about the handler call signatureAldo Cortesi2016-05-282-2/+7
* | Zap stray debugging callAldo Cortesi2016-05-281-1/+0
* | Make @controller.handler inheritance-friendlyAldo Cortesi2016-05-285-14/+35
* | Mandate that all handlers must be wrapped, make tests passAldo Cortesi2016-05-283-16/+18
* | Sketch out a more solid coreAldo Cortesi2016-05-283-19/+57
|/
* Merge pull request #1127 from mitmproxy/tcp-flowsThomas Kriechbaumer2016-05-238-56/+138
|\
| * add FlowMaster.active_flowsMaximilian Hils2016-05-192-12/+12
| * fix tests, don't double-add error'd flowsMaximilian Hils2016-05-191-2/+0
| * minor fixes, adjust testsMaximilian Hils2016-05-192-3/+3
| * mimtdump: add basic support for tcp flowsMaximilian Hils2016-05-197-55/+139
* | minor fixes (#1165)Maximilian Hils2016-05-233-7/+2
* | warn users if rfile == outfile, refs #1117Maximilian Hils2016-05-211-0/+12
* | fix weight value serializationThomas Kriechbaumer2016-05-211-1/+2
* | Merge pull request #1164 from Kriechi/improve-http2Maximilian Hils2016-05-211-4/+22
|\ \
| * | kill streams if connection gets terminatedThomas Kriechbaumer2016-05-211-3/+8
| * | implement transparent Priority updatesThomas Kriechbaumer2016-05-211-0/+12
| * | fix typoThomas Kriechbaumer2016-05-211-1/+1
| * | immediately send push to clientThomas Kriechbaumer2016-05-211-0/+1
| |/
* | Merge branch 'issue-1099'Maximilian Hils2016-05-201-1/+1
|\ \
| * | fix #1099Maximilian Hils2016-05-201-1/+1
* | | Merge branch 'mhils-multidict'Aldo Cortesi2016-05-214-53/+47
|\ \ \
| * | | Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-mul...Aldo Cortesi2016-05-214-53/+47
| |\| | | | |/ | |/|
| | * improve MultiDict, add ImmutableMultiDict, adjust response.cookiesMaximilian Hils2016-05-183-48/+42
| | * add MultiDictMaximilian Hils2016-05-182-6/+6
* | | Merge pull request #1109 from mitmproxy/faster-tlsAldo Cortesi2016-05-214-95/+110
|\ \ \
| * | | fix ClientHello.__repr__Maximilian Hils2016-05-021-1/+1
| * | | improve server tls handshake behaviourMaximilian Hils2016-05-022-11/+23
| * | | simplify ClientHello handlingMaximilian Hils2016-05-022-25/+23
| * | | improve tls handling, separate `set_server` and `set_server_tls`Maximilian Hils2016-05-023-75/+78
| * | | speed up TLS handshake if SNI is presentMaximilian Hils2016-05-021-4/+6
* | | | We don't need 3 slightly different implementations of DataAldo Cortesi2016-05-211-19/+4
| |/ / |/| |
* | | minor improvementsMaximilian Hils2016-05-191-7/+12
* | | display response reason in uiMaximilian Hils2016-05-181-3/+5
| |/ |/|
* | http2: cleanupThomas Kriechbaumer2016-05-171-22/+25
* | http2: properly handle connection errorsThomas Kriechbaumer2016-05-173-13/+37
* | Updated the docstring (#1150)Yoginski2016-05-171-1/+1
* | Fixed HTTP2 headers being folded. (#1143) (#1144)Kostya Esmukov2016-05-141-1/+1