aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * forward proxy -> upstream proxyMaximilian Hils2014-03-147-20/+20
| * remove debug switchMaximilian Hils2014-03-132-7/+1
| * order command line options, add disting proxy option groupMaximilian Hils2014-03-132-64/+70
* | Merge pull request #238 from mitmproxy/log_levelsMaximilian Hils2014-03-1816-99/+105
|\|
| * adjust command line docs, fix log typoMaximilian Hils2014-03-133-4/+4
| * fix linux tests...Maximilian Hils2014-03-131-6/+6
| * adjust tests, fix option handlingMaximilian Hils2014-03-135-17/+11
| * add support for log levelsMaximilian Hils2014-03-1310-60/+65
| * add -d switch to mitmdump to compensate for old verbosity functionalityMaximilian Hils2014-03-124-15/+24
| * restrict -e to mitmproxy only (not mitmdump)Maximilian Hils2014-03-126-16/+14
* | fix #240Maximilian Hils2014-03-181-1/+1
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-114-24/+45
|\
| * Certificate forwarding.Aldo Cortesi2014-03-114-24/+45
* | fix temporary server change, coverage++Maximilian Hils2014-03-114-15/+70
|/
* always use relative imports, fix status bar bugMaximilian Hils2014-03-1027-30/+54
* split up protocol\__init__.pyMaximilian Hils2014-03-108-116/+113
* Merge branch 'absolutely_relative_proxying'Maximilian Hils2014-03-1018-233/+260
|\
| * update docs, fix #215Maximilian Hils2014-03-105-27/+29
| * add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-1014-164/+182
| * lay the foundations for --(in|out)(abs|rel) command line switches, as propose...Maximilian Hils2014-03-106-61/+68
* | Merge pull request #231 from benwa/patch-1Aldo Cortesi2014-03-101-0/+3
|\ \
| * | Update webapp.htmlBennett Blodinger2014-03-081-0/+3
* | | Merge pull request #232 from benwa/patch-2Aldo Cortesi2014-03-101-6/+0
|\ \ \
| * | | Update layout.htmlBennett Blodinger2014-03-081-6/+0
| |/ /
* | | Merge pull request #233 from mitmproxy/untangle_circular_dependenciesAldo Cortesi2014-03-1023-668/+690
|\ \ \ | |/ / |/| / | |/
| * fix mentions of CONTENT_MISSING in libmproxy.consoleMaximilian Hils2014-03-092-5/+7
| * finish proxy.py split upMaximilian Hils2014-03-0922-288/+289
| * split up proxy.pyMaximilian Hils2014-03-0913-188/+207
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 06:59:31 +0000