aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * Merge branch 'issue_341' into server_change_apiMaximilian Hils2014-09-044-9/+7
| | | | |\ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: examples/redirect_requests.py libmproxy/console/common.py
| * | | | 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 ↵Maximilian Hils2014-09-071-3/+0
| | | | | | | | | | | | | | | | specified, which comes with a pretty big warning itself
* | | | 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 ↵Maximilian Hils2014-09-042-11/+1
| | | | | | | | (https://github.com/mitmproxy/netlib/commit/f5fdfd8a9f17e0fe213a9cf54acae84e4bc31462)
* | fix #344Maximilian Hils2014-09-041-2/+3
| |
* | Merge pull request #343 from deployable/masterMaximilian Hils2014-09-041-0/+2
|\ \ | | | | | | Add urwid stop prior to exception output so stack trace is not cleared
| * | 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"
| | * Drop usage of obsolete function "file"Seppo Yli-Olli2014-08-291-2/+2
| |/ | | | | Also use context manager
* / 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 ↵Maximilian Hils2014-08-171-13/+17
| | | | considered for the server connection
* 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
|
* remove pydivert from requirements.txt to fix testsMaximilian Hils2014-08-101-2/+1
|
* adjust testsMaximilian Hils2014-08-102-3/+3
|
* fix #270Maximilian Hils2014-08-105-14/+17
|
* implement passthrough mode, fixes #175Maximilian Hils2014-08-094-23/+42
|
* fix #274Maximilian Hils2014-08-092-4/+8
|
* fix replay formMaximilian Hils2014-08-091-2/+7
|
* fix #308Maximilian Hils2014-08-083-37/+59
|
* fix display of urls in upstream mode, refs #308Maximilian Hils2014-08-084-3/+24
|
* fix #318Maximilian Hils2014-08-082-46/+64
|
* remove platform.setupMaximilian Hils2014-08-084-9/+6
|
* properly express state information on server connections, refs #315Maximilian Hils2014-08-085-34/+44
|
* fix script path escaping on windows, refs #293Maximilian Hils2014-08-081-0/+3
|
* docs: add docs for script args, fix #293Maximilian Hils2014-08-073-14/+29
|