aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* fix windows tests, include improvements from 0.10.1Maximilian Hils2014-03-084-5/+8
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-0815-227/+384
|\
| * Revert to old cert names, use a subdir for test conf dir.Aldo Cortesi2014-03-073-5/+5
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-03-071-1/+0
| |\
| | * Merge pull request #230 from sergeychipiga/fix/remove-redundant-codelineMaximilian Hils2014-03-051-1/+0
| | |\
| | | * remove redundant codelineSergey Chipiga2014-03-051-1/+0
| | |/
| * / Use the right conf dir...Aldo Cortesi2014-03-071-1/+1
| |/
| * Much more sophisticated cert handlingAldo Cortesi2014-03-057-80/+63
| * Minor cleanups.Aldo Cortesi2014-03-026-16/+13
| * Cipher specification.Aldo Cortesi2014-03-021-5/+20
| * Improve explicit certificate specificationAldo Cortesi2014-03-024-16/+36
| * Update for pathod.SSLOptions changes.Aldo Cortesi2014-03-021-1/+1
| * Adapt for new pathod and netlib APIs.Aldo Cortesi2014-03-024-9/+12
| * Merge pull request #223 from droope/improve-backwards-searchAldo Cortesi2014-02-263-141/+281
| |\
| | * add helpful messages on wrapPedro Worcel2014-02-222-12/+26
| | * fix the wrapping on backward searchesPedro Worcel2014-02-222-16/+45
| | * add docsPedro Worcel2014-02-221-1/+2
| | * add multi-line support to backwards searchPedro Worcel2014-02-222-15/+41
| | * add multi-line supportPedro Worcel2014-02-222-3/+25
| | * add basic backwards searchPedro Worcel2014-02-223-122/+170
| |/
* / combine asterisk-form and origin-form into relative formMaximilian Hils2014-03-083-18/+15
|/
* fix bug: ensure that server connection is present for tcp connectionsMaximilian Hils2014-02-171-0/+1
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-02-171-1/+1
|\
| * Bump versionMaximilian Hils2014-02-111-1/+1
* | fix commentsMaximilian Hils2014-02-092-6/+7
|/
* Fix flow initialization order errorAldo Cortesi2014-02-084-15/+16
* Better response when mitmproxy crashes.Aldo Cortesi2014-02-082-3/+8
* Merge pull request #208 from kmike/pillow-setuppyAldo Cortesi2014-02-081-1/+1
|\
| * remove upper bound for Pillow in setup.pyMikhail Korobov2014-02-051-1/+1
* | Cleanup: fix unit tests, simpler app test, remove print statementsAldo Cortesi2014-02-089-85/+76
* | fix testsMaximilian Hils2014-02-071-0/+3
* | add tests for reconnect to upstream proxy, ensure that server_reconnect is al...Maximilian Hils2014-02-075-41/+137
* | Achievement Unlocked: Proxy ChainMaximilian Hils2014-02-076-9/+78
* | fix race conditions in test suiteMaximilian Hils2014-02-073-9/+20
* | coverage++Maximilian Hils2014-02-077-31/+147
* | test libmproxy.app, increase coverageMaximilian Hils2014-02-077-32/+97
* | finalize mergeMaximilian Hils2014-02-062-4/+4
* | add functionality to change the destination serverMaximilian Hils2014-02-063-25/+55
* | remove LEGACY switches, always update flow.server_connMaximilian Hils2014-02-061-13/+10
* | fix bugs, expose timestamp information to console uiMaximilian Hils2014-02-068-26/+32
* | mock urwid to run console tests on windows, push failing testcases down to 0....Maximilian Hils2014-02-054-16/+22
* | add skeleton to change destinatin server during intercept, fix all testcases ...Maximilian Hils2014-02-059-79/+159
* | Merge branch 'master' into tcp_proxyMaximilian Hils2014-02-052-2/+18
|\|
| * add example to show how to read mitmproxy dump files, refs #207Maximilian Hils2014-02-041-0/+17
| * shutdown properly if we dont keep servingMaximilian Hils2014-02-041-1/+1
| * fixing bug: AttributeError: DumpMaster instance has no attribute 'unload_script'Steven Van Acker2014-02-041-2/+1
* | fix all tests except those using set_url and get_urlMaximilian Hils2014-02-0512-93/+74
* | push failing tests down to 43Maximilian Hils2014-02-048-248/+228
* | add priorities for the destination server addressMaximilian Hils2014-02-042-55/+114
* | bring failing tests back into the double-digit rangeMaximilian Hils2014-01-3111-260/+296