14 Commits

Author	SHA1	Message	Date
Maximilian Hils	4d2109ef92	fix display of urls in upstream mode, refs #308	2014-08-08 17:49:02 +02:00
Maximilian Hils	c9be57b682	fix #313	2014-07-27 03:28:23 +02:00
Maximilian Hils	00fd243810	fix up error messages	2014-05-15 18:16:42 +02: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
Maximilian Hils	2b01c4eee7	Merge branch 'master' of github.com:mitmproxy/mitmproxy	2014-03-08 15:47:27 +01:00
Maximilian Hils	3032672f10	combine asterisk-form and origin-form into relative form	2014-03-08 15:47:09 +01:00
Aldo Cortesi	a34a483184	Adapt for new pathod and netlib APIs.	2014-03-02 15:14:22 +13:00
Aldo Cortesi	a85974eaa8	Fix flow initialization order error ... Resolves #210	2014-02-08 17:17:35 +13:00
Maximilian Hils	33b10da57c	fix tests	2014-02-07 18:26:42 +01:00
Maximilian Hils	735e4400c4	add tests for reconnect to upstream proxy, ensure that server_reconnect is always hooked	2014-02-07 18:14:15 +01:00
Maximilian Hils	545fc2506b	Achievement Unlocked: Proxy Chain	2014-02-07 07:08:59 +01:00
Maximilian Hils	9526c5d565	fix race conditions in test suite	2014-02-07 04:15:24 +01:00
Maximilian Hils	d07029d575	coverage++	2014-02-07 03:56:57 +01:00