17 Commits

Author	SHA1	Message	Date
Maximilian Hils	4f1fe11549	Merge pull request #269 from shvar/master ... init ProxyConfig.certstore with custom certs	2014-04-29 16:54:58 +02:00
Eli Shvartsman	1f29b16fb7	fix default certs	2014-04-29 16:13:12 +03:00
Eli Shvartsman	e2501960d3	init ProxyConfig.certstore with custom certs	2014-04-29 15:54:11 +03:00
Eli Shvartsman	ed91e19e0b	Update server.py ... We should ask for upstream cert only if there is: 1) no no_upstream_cert option specified 2) ssl connection to server is established	2014-04-29 12:41:59 +03:00
Maximilian Hils	a66913d4a3	forward proxy -> upstream proxy	2014-03-14 00:02:00 +01:00
Maximilian Hils	4e17b00ce8	order command line options, add disting proxy option group	2014-03-13 23:43:26 +01:00
Maximilian Hils	1bfc164692	adjust tests, fix option handling	2014-03-13 01:22:12 +01:00
Maximilian Hils	4d9799f103	add support for log levels	2014-03-13 01:04:45 +01:00
Maximilian Hils	14db30080f	Merge branch 'master' of github.com:mitmproxy/mitmproxy	2014-03-11 02:16:30 +01:00
Maximilian Hils	15c82f743f	fix temporary server change, coverage++	2014-03-11 02:16:22 +01:00
Aldo Cortesi	e89e035d4a	Certificate forwarding.	2014-03-11 13:02:10 +13:00
Maximilian Hils	c1fff51b1b	always use relative imports, fix status bar bug	2014-03-10 22:36:47 +01:00
Maximilian Hils	e6349b540f	split up protocol\__init__.py	2014-03-10 21:57:50 +01:00
Maximilian Hils	9cc10630c8	update docs, fix #215	2014-03-10 17:01:30 +01:00
Maximilian Hils	fe58c1c6eb	add advanced proxying options, add SSL-terminating capability to mitmproxy	2014-03-10 05:11:51 +01:00
Maximilian Hils	78750a8b4d	lay the foundations for --(in|out)(abs|rel) command line switches, as proposed in https://groups.google.com/forum/#!topic/mitmproxy/nApno2TXS0c	2014-03-10 02:32:27 +01:00
Maximilian Hils	5598a8de82	finish proxy.py split up	2014-03-09 21:51:24 +01:00