aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #342 from mitmproxy/server_change_apiAldo Cortesi2014-09-0734-711/+779
| |\
| | * Merge branch 'issue_341' into server_change_apiMaximilian Hils2014-09-064-6/+17
| | |\ | | |/ | |/|
| * | Merge branch 'master' into issue_341Maximilian Hils2014-09-065-12/+36
| |\ \
| | | * fix race condition with the concurrent decoratorMaximilian Hils2014-09-061-6/+19
| | | * streamline HTTPHandler.handle_flow()Maximilian Hils2014-09-051-95/+96
| | | * update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93Maximilian Hils2014-09-0520-166/+176
| | | * iframe injector example: use inline scriptMaximilian Hils2014-09-053-50/+20
| | | * change replay_request behaviour, refs #346; test upstream proxy modeMaximilian Hils2014-09-055-223/+223
| | | * much tests. so tcp. very wow.Maximilian Hils2014-09-047-50/+59
| | | * coverage++Maximilian Hils2014-09-046-15/+54
| | | * coverage++Maximilian Hils2014-09-043-2/+35
| | | * Merge branch 'issue_341' into server_change_apiMaximilian Hils2014-09-043-9/+5
| | | |\ | | |_|/ | |/| |
| * | | Merge branch 'master' into issue_341Maximilian Hils2014-09-043-9/+5
| |\ \ \
| | | | * Merge branch 'issue_341' into server_change_apiMaximilian Hils2014-09-044-9/+7
| | | | |\ | | |_|_|/ | |/| | |
| * | | | fix some leftoversMaximilian Hils2014-09-044-9/+7
| | | | * improve HTTPRequest syntaxMaximilian Hils2014-09-0314-187/+151
| | | | * simplify server changes for inline scriptsMaximilian Hils2014-09-035-73/+115
| | |_|/ | |/| |
| * | | fix #341 - work on flows instead of request/response internally.Maximilian Hils2014-09-0320-531/+463
* | | | docs: mitmproxy now displays the reverse proxy server unless --host is specif...Maximilian Hils2014-09-071-3/+0
* | | | add docs on proxy modesMaximilian Hils2014-09-0724-1/+247
* | | | test streamingMaximilian Hils2014-09-061-4/+15
* | | | coverage++Maximilian Hils2014-09-063-7/+30
| |_|/ |/| |
* | | fix race condition with the concurrent decoratorMaximilian Hils2014-09-061-6/+19
* | | coverage++Maximilian Hils2014-09-062-6/+17
* | | add architecture illustrationMaximilian Hils2014-09-052-0/+0
| |/ |/|
* | remove outdated IOError test case (https://github.com/mitmproxy/netlib/commit...Maximilian Hils2014-09-042-11/+1
* | fix #344Maximilian Hils2014-09-041-2/+3
* | Merge pull request #343 from deployable/masterMaximilian Hils2014-09-041-0/+2
|\ \
| * | Add urwid stop prior to stack trace so exceptions are not cleared from screendeployable2014-09-041-0/+2
|/ /
* / fix IOError handlingMaximilian Hils2014-09-032-2/+5
|/
* http: ignore disconnects that happen between requestsMaximilian Hils2014-09-031-2/+5
* ui: display * instead of 0.0.0.0 for the bound addressMaximilian Hils2014-09-033-3/+6
* improve error handlingMaximilian Hils2014-09-025-70/+76
* minor fixesMaximilian Hils2014-08-313-4/+3
* refactor protocol handling, fix #332Maximilian Hils2014-08-308-76/+87
* Windows transparent proxy: allow specification of custom WinDivert filter rulesMaximilian Hils2014-08-301-11/+18
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-08-301-2/+2
|\
| * Merge pull request #339 from nanonyme/patch-1Maximilian Hils2014-08-291-2/+2
| |\
| | * Drop usage of obsolete function "file"Seppo Yli-Olli2014-08-291-2/+2
| |/
* / Windows transparent proxy: proxy local trafficMaximilian Hils2014-08-3010-1056/+204
|/
* fix #328Maximilian Hils2014-08-244-43/+52
* fix #330Maximilian Hils2014-08-231-10/+12
* add trove classifier for Python 2Maximilian Hils2014-08-191-0/+1
* make sure that flow.server_conn is set when script hook is calledMaximilian Hils2014-08-181-7/+8
* fix script testsMaximilian Hils2014-08-183-18/+27
* fix #327Maximilian Hils2014-08-182-0/+39
* fix: changes to request.host in the request inline script hook are now consid...Maximilian Hils2014-08-171-13/+17
* fix #324Maximilian Hils2014-08-171-8/+13
* adjust to netlib changesMaximilian Hils2014-08-173-4/+2
* do not connect if inline script already connected to upstream serverMaximilian Hils2014-08-121-1/+1