aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #347 from mitmproxy/issue_341Aldo Cortesi2014-09-075-45/+20
|\
| * update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93Maximilian Hils2014-09-053-5/+5
| * coverage++Maximilian Hils2014-09-041-9/+4
| * simplify server changes for inline scriptsMaximilian Hils2014-09-033-31/+11
* | coverage++Maximilian Hils2014-09-061-6/+6
|/
* improve error handlingMaximilian Hils2014-09-022-15/+17
* minor fixesMaximilian Hils2014-08-312-2/+1
* refactor protocol handling, fix #332Maximilian Hils2014-08-303-37/+29
* fix script testsMaximilian Hils2014-08-181-0/+2
* fix #327Maximilian Hils2014-08-181-0/+20
* do not connect if inline script already connected to upstream serverMaximilian Hils2014-08-121-1/+1
* fix #270Maximilian Hils2014-08-101-3/+4
* implement passthrough mode, fixes #175Maximilian Hils2014-08-092-18/+26
* fix #308Maximilian Hils2014-08-081-1/+1
* fix display of urls in upstream mode, refs #308Maximilian Hils2014-08-081-1/+1
* fix #318Maximilian Hils2014-08-081-33/+47
* remove platform.setupMaximilian Hils2014-08-081-2/+0
* properly express state information on server connections, refs #315Maximilian Hils2014-08-082-3/+11
* fix #317Maximilian Hils2014-08-031-2/+2
* Merge branch 'stream'Maximilian Hils2014-07-311-2/+2
|\
| * always initialize HTTPResponse.stream attributeMaximilian Hils2014-07-231-2/+2
* | fix #259Maximilian Hils2014-07-261-3/+9
* | if no_upstream_cert is set, include SNI value als SubjectAltName, fix #291Maximilian Hils2014-07-181-0/+2
* | add transparent proxy mode on windows (docs still missing)Maximilian Hils2014-07-161-0/+2
|/
* fix ProxyError inheritanceMaximilian Hils2014-06-251-6/+4
* expose socknameMaximilian Hils2014-06-251-0/+3
* add support for certificate chains, refs #174Maximilian Hils2014-05-212-3/+6
* fix up error messagesMaximilian Hils2014-05-151-21/+19
* re-use cert creation from netlib in handle_sni, fix #272Maximilian Hils2014-05-151-13/+22
* 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
|/
* forward proxy -> upstream proxyMaximilian Hils2014-03-142-6/+6
* order command line options, add disting proxy option groupMaximilian Hils2014-03-131-0/+5
* adjust tests, fix option handlingMaximilian Hils2014-03-131-1/+1
* add support for log levelsMaximilian Hils2014-03-132-17/+21
* 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-112-5/+7
|/
* always use relative imports, fix status bar bugMaximilian Hils2014-03-104-1/+7
* split up protocol\__init__.pyMaximilian Hils2014-03-102-3/+5
* update docs, fix #215Maximilian Hils2014-03-101-9/+11
* add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-103-69/+72
* lay the foundations for --(in|out)(abs|rel) command line switches, as propose...Maximilian Hils2014-03-103-23/+13
* finish proxy.py split upMaximilian Hils2014-03-095-0/+590