aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'absolutely_relative_proxying'Maximilian Hils2014-03-1010-172/+199
|\
| * update docs, fix #215Maximilian Hils2014-03-104-13/+15
| * add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-108-117/+140
| * lay the foundations for --(in|out)(abs|rel) command line switches, as propose...Maximilian Hils2014-03-104-55/+57
* | Merge pull request #232 from benwa/patch-2Aldo Cortesi2014-03-101-6/+0
|\ \ | |/ |/|
| * Update layout.htmlBennett Blodinger2014-03-081-6/+0
* | fix mentions of CONTENT_MISSING in libmproxy.consoleMaximilian Hils2014-03-092-5/+7
* | finish proxy.py split upMaximilian Hils2014-03-0913-256/+247
* | split up proxy.pyMaximilian Hils2014-03-099-178/+193
|/
* fix windows tests, include improvements from 0.10.1Maximilian Hils2014-03-081-0/+1
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-087-104/+177
|\
| * Revert to old cert names, use a subdir for test conf dir.Aldo Cortesi2014-03-071-3/+3
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-03-071-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-052-60/+45
| * Minor cleanups.Aldo Cortesi2014-03-023-11/+9
| * Cipher specification.Aldo Cortesi2014-03-021-5/+20
| * Improve explicit certificate specificationAldo Cortesi2014-03-022-13/+29
| * Adapt for new pathod and netlib APIs.Aldo Cortesi2014-03-022-3/+2
| * add helpful messages on wrapPedro Worcel2014-02-221-11/+25
| * fix the wrapping on backward searchesPedro Worcel2014-02-221-15/+26
| * add docsPedro Worcel2014-02-221-1/+2
| * add multi-line support to backwards searchPedro Worcel2014-02-221-7/+11
| * add multi-line supportPedro Worcel2014-02-221-3/+10
| * add basic backwards searchPedro Worcel2014-02-221-25/+49
* | combine asterisk-form and origin-form into relative formMaximilian Hils2014-03-081-10/+7
|/
* 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-083-14/+16
* Better response when mitmproxy crashes.Aldo Cortesi2014-02-082-3/+8
* add tests for reconnect to upstream proxy, ensure that server_reconnect is al...Maximilian Hils2014-02-073-31/+36
* Achievement Unlocked: Proxy ChainMaximilian Hils2014-02-073-1/+4
* coverage++Maximilian Hils2014-02-073-26/+43
* test libmproxy.app, increase coverageMaximilian Hils2014-02-076-32/+47
* finalize mergeMaximilian Hils2014-02-061-2/+2
* 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-066-22/+29
* mock urwid to run console tests on windows, push failing testcases down to 0....Maximilian Hils2014-02-051-1/+1
* add skeleton to change destinatin server during intercept, fix all testcases ...Maximilian Hils2014-02-055-67/+134
* Merge branch 'master' into tcp_proxyMaximilian Hils2014-02-051-2/+1
|\
| * 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-057-15/+23
* | push failing tests down to 43Maximilian Hils2014-02-044-155/+165
* | add priorities for the destination server addressMaximilian Hils2014-02-042-55/+114
* | bring failing tests back into the double-digit rangeMaximilian Hils2014-01-317-144/+165