aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Start cleaning up netlib.utilsAldo Cortesi2016-05-3117-155/+157
* Merge pull request #1178 from cortesi/pseudohdrsAldo Cortesi2016-05-314-10/+35
|\
| * Extend pseudo-header treatment to :status on responsesAldo Cortesi2016-05-311-2/+6
| * Improve handling of pseudo-headersAldo Cortesi2016-05-314-8/+29
|/
* Make tox run all tests for 2.7Aldo Cortesi2016-05-311-0/+5
* Fix test import errorAldo Cortesi2016-05-311-1/+2
* Merge branch 'flow-module-2' of https://github.com/mhils/mitmproxy into mhils...Aldo Cortesi2016-05-3110-1282/+1295
|\
| * tell flake8 that type-annotation imports are okayMaximilian Hils2016-05-302-3/+3
| * split mitmproxy.flow into mitmproxy.flow.*Maximilian Hils2016-05-3010-1282/+1295
* | activate flake8 for good!Thomas Kriechbaumer2016-05-302-2/+2
|/
* start of developing server side for options (#1155)Clemens Brunner2016-05-298-210/+599
* Satisfy flake8Aldo Cortesi2016-05-303-7/+7
* Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-toxAldo Cortesi2016-05-303-0/+13
|\
| * add toxThomas Kriechbaumer2016-05-293-0/+13
* | fixThomas Kriechbaumer2016-05-291-1/+1
* | fix windows pathsThomas Kriechbaumer2016-05-291-2/+2
|/
* fix har testThomas Kriechbaumer2016-05-291-5/+5
* fix bytes vs. strThomas Kriechbaumer2016-05-291-2/+2
* fix headers orderThomas Kriechbaumer2016-05-292-3/+3
* handle_* -> * leftoversMaximilian Hils2016-05-295-11/+14
* cleanupThomas Kriechbaumer2016-05-293-1/+3
* raise a more verbose errorThomas Kriechbaumer2016-05-291-3/+3
* more style cleanupThomas Kriechbaumer2016-05-293-14/+24
* fix #1162Thomas Kriechbaumer2016-05-291-2/+5
* more style cleanupThomas Kriechbaumer2016-05-2964-99/+139
* fix travis with flake8Thomas Kriechbaumer2016-05-291-1/+1
* install flake8Thomas Kriechbaumer2016-05-291-4/+5
* more style cleanupThomas Kriechbaumer2016-05-2917-72/+76
* change comment indentationThomas Kriechbaumer2016-05-291-3/+3
* Merge pull request #1173 from mitmproxy/format-examplesThomas Kriechbaumer2016-05-2911-23/+28
|\
| * format examplesMaximilian Hils2016-05-2911-23/+28
* | Merge pull request #1174 from Kriechi/flake8Thomas Kriechbaumer2016-05-291-0/+1
|\ \
| * | make sure we do not introduce more style offensesThomas Kriechbaumer2016-05-291-0/+1
* | | fix docs typoMaximilian Hils2016-05-294-520/+0
* | | Update method names in /examples/flowbasicAldo Cortesi2016-05-291-2/+2
* | | controller.ControlError -> exceptions.ControlExceptionAldo Cortesi2016-05-292-12/+11
| |/ |/|
* | Add some comments to controller wrapper.Aldo Cortesi2016-05-291-0/+5
* | Merge pull request #1172 from cortesi/solidcoreAldo Cortesi2016-05-2916-234/+301
|\ \
| * | Adapt examplesAldo Cortesi2016-05-293-18/+17
| * | handle_* -> *Aldo Cortesi2016-05-2912-108/+104
| * | Explicitly list all eventsAldo Cortesi2016-05-292-2/+25
| * | Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcoreAldo Cortesi2016-05-290-0/+0
| |\ \
| | * \ Merge branch 'master' into solidcoreAldo Cortesi2016-05-282-5/+5
| | |\ \
| * | | | Flatten ServerMaster into MasterAldo Cortesi2016-05-293-38/+11
| * | | | Merge branch 'master' into solidcoreAldo Cortesi2016-05-2957-117/+124
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| * | | Be stricter about the handler call signatureAldo Cortesi2016-05-282-2/+7
| * | | Merge branch 'master' into solidcoreAldo Cortesi2016-05-281-1/+3
| |\ \ \
| * | | | Zap stray debugging callAldo Cortesi2016-05-281-1/+0
| * | | | Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcoreAldo Cortesi2016-05-280-0/+0
| |\ \ \ \
| | * | | | Mandate that all handlers must be wrapped, make tests passAldo Cortesi2016-05-265-34/+44