aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* fix up error messagesMaximilian Hils2014-05-153-76/+79
* fix #267Maximilian Hils2014-05-151-1/+3
* re-use cert creation from netlib in handle_sni, fix #272Maximilian Hils2014-05-151-13/+22
* - changed license to MIT, as it is more easily integrated into the mitmproxy ...davidpshaw2014-05-066-69/+105
* - working WBXML parserDavid Shaw2014-05-069-0/+1200
* Merge pull request #269 from shvar/masterMaximilian Hils2014-04-291-1/+3
|\
| * fix default certsEli Shvartsman2014-04-291-1/+1
| * init ProxyConfig.certstore with custom certsEli Shvartsman2014-04-291-0/+2
* | Update server.pyEli Shvartsman2014-04-291-1/+1
|/
* Fix proxy optionsAldo Cortesi2014-04-121-2/+2
* fix issue #260Maximilian Hils2014-04-071-1/+3
* beef up error messagesMaximilian Hils2014-03-261-1/+1
* add requests to requrements, improve error loggingMaximilian Hils2014-03-191-1/+4
* fix minor version stringMaximilian Hils2014-03-191-1/+1
* fix display bugs (fixes #243)Maximilian Hils2014-03-182-2/+7
* forward proxy -> upstream proxyMaximilian Hils2014-03-143-12/+12
* remove debug switchMaximilian Hils2014-03-131-5/+1
* order command line options, add disting proxy option groupMaximilian Hils2014-03-132-64/+70
* adjust command line docs, fix log typoMaximilian Hils2014-03-132-3/+3
* adjust tests, fix option handlingMaximilian Hils2014-03-132-2/+1
* add support for log levelsMaximilian Hils2014-03-1310-60/+65
* add -d switch to mitmdump to compensate for old verbosity functionalityMaximilian Hils2014-03-123-15/+18
* restrict -e to mitmproxy only (not mitmdump)Maximilian Hils2014-03-124-14/+7
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-112-24/+36
|\
| * Certificate forwarding.Aldo Cortesi2014-03-112-24/+36
* | fix temporary server change, coverage++Maximilian Hils2014-03-113-15/+14
|/
* 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-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