16 Commits

Author	SHA1	Message	Date
Aldo Cortesi	a05a70d816	Add coding style check, reformat.	2015-05-30 12:03:28 +12:00
Maximilian Hils	7c56a3bb01	Add SOCKS5 mode, fix #305	2014-10-09 01:59:02 +02:00
Maximilian Hils	d06b4bfa4e	remove proxy mode abstraction: always be clear which mode we are in	2014-09-08 14:32:42 +02:00
Maximilian Hils	cd43c5ba9c	simplify server changes for inline scripts	2014-09-03 20:12:30 +02:00
Maximilian Hils	1a41c15c03	minor fixes	2014-08-31 16:52:26 +02:00
Maximilian Hils	1f47f7b6b2	refactor protocol handling, fix #332	2014-08-30 20:15:19 +02:00
Maximilian Hils	858b0af0bb	fix #270	2014-08-10 16:10:49 +02:00
Maximilian Hils	c039e4a2e3	fix ProxyError inheritance	2014-06-25 23:25:49 +02:00
Maximilian Hils	a66913d4a3	forward proxy -> upstream proxy	2014-03-14 00:02:00 +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	15c82f743f	fix temporary server change, coverage++	2014-03-11 02:16:22 +01:00
Maximilian Hils	c1fff51b1b	always use relative imports, fix status bar bug	2014-03-10 22:36:47 +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