aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rudimentary testing for client certs.Aldo Cortesi2013-01-185-2/+41
* Speed up the test suite by reducing time sleeping in tests.Aldo Cortesi2013-01-181-3/+2
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-01-185-22/+137
|\
| * Merge pull request #93 from rouli/masterAldo Cortesi2013-01-173-20/+77
| |\
| | * fixes due to merge with masterRouli2013-01-171-1/+2
| | * Merge remote-tracking branch 'upstream/master'Rouli2013-01-1764-692/+5426
| | |\ | | |/ | |/|
| * | Merge pull request #91 from termie/patch-1Aldo Cortesi2013-01-141-3/+2
| |\ \
| | * | fix some syntax / formatting in the docsAndy Smith2013-01-111-3/+2
| * | | Merge pull request #92 from pielgrzym/injectorAldo Cortesi2013-01-141-0/+50
| |\ \ \ | | |/ / | |/| |
| | * | New example - standalone proxy injecting iframes into responsesJakub Nawalaniec2013-01-131-0/+50
| |/ /
| | * changing requests and responses to have two timestamps, one marking their ini...Rouli2013-01-173-19/+75
* | | Unit tests and minor code refactoring for ServerConnection.Aldo Cortesi2013-01-054-16/+57
|/ /
* | Remove cert_wait_time flag.Aldo Cortesi2013-01-062-11/+1
* | Use new netlib certificate store implementation.Aldo Cortesi2013-01-062-15/+6
* | Unit test love - 100% for flow.py, dump.pyAldo Cortesi2013-01-053-5/+28
* | Minor cleanups of proxy request handling.Aldo Cortesi2013-01-042-5/+7
* | First draft of "How mitmproxy works", a complete guide to the mechanics of th...Aldo Cortesi2013-01-0323-47/+3871
* | Docs: remove proxydroid instructions from Android.Aldo Cortesi2013-01-033-54/+4
* | Docs: move features into their own directoryAldo Cortesi2013-01-0313-11/+16
* | Docs: Set HeadersAldo Cortesi2013-01-031-1/+17
* | Docs - features.Aldo Cortesi2013-01-027-34/+130
* | Refactor proxy auth a bitAldo Cortesi2013-01-022-36/+14
* | Documentation, setup.py updates, styling.Aldo Cortesi2013-01-0211-53/+62
* | Docs and ReadmeAldo Cortesi2013-01-018-116/+33
* | Preliminary changelog.Aldo Cortesi2013-01-012-40/+80
* | Docs: make nav sidebar workAldo Cortesi2013-01-012-31/+40
* | Much-needed facelift for the docs.Aldo Cortesi2013-01-0110-230/+1017
* | Better error handling for transparent mode remote address resolution.Aldo Cortesi2013-01-012-2/+8
* | First draft of OSX transparent proxy mode.Aldo Cortesi2013-01-014-97/+47
* | More work on proxy authAldo Cortesi2012-12-313-14/+56
* | Test and robustify BasicProxyAuth.parse_auth_valueAldo Cortesi2012-12-312-6/+29
* | Start solidifying proxy authenticationAldo Cortesi2012-12-313-19/+46
* | Merge pull request #83 from rouli/masterAldo Cortesi2012-12-305-29/+288
|\|
| * adding some simple authetication code to limit proxy accessisrael2012-12-304-38/+99
| * adding some simple authetication code to limit proxy accessisrael2012-12-302-0/+198
|/
* Merge pull request #82 from kanzure/show-filepath-in-statusbarAldo Cortesi2012-12-301-0/+3
|\
| * show current filepath in status barBryan Bishop2012-12-261-0/+3
* | Merge pull request #81 from kanzure/issue/79Aldo Cortesi2012-12-302-10/+18
|\ \ | |/ |/|
| * fix external viewer using shlexBryan Bishop2012-12-222-10/+18
|/
* Merge pull request #75 from kanzure/whitespacefixingAldo Cortesi2012-12-117-31/+31
|\
| * remove trailing whitespaceBryan Bishop2012-12-097-31/+31
|/
* Merge pull request #74 from kanzure/editexceptionAldo Cortesi2012-12-051-1/+4
|\
| * Show an error when $EDITOR/$PAGER are unset.Bryan Bishop2012-12-051-1/+4
|/
* Fix READMEs: we don't support Python 2.6Aldo Cortesi2012-11-302-2/+2
* Substantially rewrite AMF decoding.Aldo Cortesi2012-11-265-33/+90
* Merge pull request #69 from mat128/masterAldo Cortesi2012-11-241-2/+7
|\
| * Workaround for PIL's ambiguious import method and/or easy_install PIL packagi...Mathieu Mitchell2012-11-231-2/+7
|/
* We now require Urwid 1.1 or newer.Aldo Cortesi2012-11-231-1/+1
* Move eventlog to new Urwid container API.Aldo Cortesi2012-11-231-4/+2
* Urwid 1.1 compatibility.Aldo Cortesi2012-10-292-4/+4