cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Collapse)	Author	Age	Files	Lines
*	change comment indentation	Thomas Kriechbaumer	2016-05-29	1	-3/+3
\|
*	Merge pull request #1173 from mitmproxy/format-examples	Thomas Kriechbaumer	2016-05-29	11	-23/+28
\|\ \| \| \| \|	Format examples
\| *	format examples	Maximilian Hils	2016-05-29	11	-23/+28
\| \|
* \|	Merge pull request #1174 from Kriechi/flake8	Thomas Kriechbaumer	2016-05-29	1	-0/+1
\|\ \ \| \| \| \| \| \|	make sure we do not introduce more style offenses
\| * \|	make sure we do not introduce more style offenses	Thomas Kriechbaumer	2016-05-29	1	-0/+1
\| \| \|
* \| \|	fix docs typo	Maximilian Hils	2016-05-29	4	-520/+0
\| \| \|
* \| \|	Update method names in /examples/flowbasic	Aldo Cortesi	2016-05-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Please enter the commit message for your changes. Lines starting
* \| \|	controller.ControlError -> exceptions.ControlException	Aldo Cortesi	2016-05-29	2	-12/+11
\| \|/ \|/\|
* \|	Add some comments to controller wrapper.	Aldo Cortesi	2016-05-29	1	-0/+5
\| \|
* \|	Merge pull request #1172 from cortesi/solidcore	Aldo Cortesi	2016-05-29	16	-234/+301
\|\ \ \| \| \| \| \| \|	First steps to solidifying the core
\| * \|	Adapt examples	Aldo Cortesi	2016-05-29	3	-18/+17
\| \| \|
\| * \|	handle_* -> *	Aldo Cortesi	2016-05-29	12	-108/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that we have the controller.handler decorator, the _handler prefix stutters.
\| * \|	Explicitly list all events	Aldo Cortesi	2016-05-29	2	-2/+25
\| \| \|
\| * \|	Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore	Aldo Cortesi	2016-05-29	0	-0/+0
\| \|\ \
\| \| * \	Merge branch 'master' into solidcore	Aldo Cortesi	2016-05-28	2	-5/+5
\| \| \|\ \
\| * \| \| \|	Flatten ServerMaster into Master	Aldo Cortesi	2016-05-29	3	-38/+11
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into solidcore	Aldo Cortesi	2016-05-29	57	-117/+124
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| / \| \| \| \|/ \| \| \|/\|
\| * \| \|	Be stricter about the handler call signature	Aldo Cortesi	2016-05-28	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses this to catch an error in mitmweb
\| * \| \|	Merge branch 'master' into solidcore	Aldo Cortesi	2016-05-28	1	-1/+3
\| \|\ \ \
\| * \| \| \|	Zap stray debugging call	Aldo Cortesi	2016-05-28	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore	Aldo Cortesi	2016-05-28	0	-0/+0
\| \|\ \ \ \
\| \| * \| \| \|	Mandate that all handlers must be wrapped, make tests pass	Aldo Cortesi	2016-05-26	5	-34/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mitmproxy, mitmdump and mitmweb masters still to be done
\| \| * \| \| \|	Sketch out a more solid core	Aldo Cortesi	2016-05-26	7	-35/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Decorator for handler methods - Stricter checking for double-acks and non-acks
\| * \| \| \| \|	Make @controller.handler inheritance-friendly	Aldo Cortesi	2016-05-28	6	-18/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use this to adapt mitmweb and mitproxy console
\| * \| \| \| \|	Mandate that all handlers must be wrapped, make tests pass	Aldo Cortesi	2016-05-28	5	-34/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mitmproxy, mitmdump and mitmweb masters still to be done
\| * \| \| \| \|	Sketch out a more solid core	Aldo Cortesi	2016-05-28	7	-35/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Decorator for handler methods - Stricter checking for double-acks and non-acks
* \| \| \| \| \|	fix tests	Maximilian Hils	2016-05-28	7	-8/+8
\| \| \| \| \| \|
* \| \| \| \| \|	minor improvements	Maximilian Hils	2016-05-28	1	-4/+4
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	mitmproxy: fix most flake8 offenses	Thomas Kriechbaumer	2016-05-28	12	-19/+36
\| \| \| \| \|
* \| \| \| \|	pathod: fix most flake8 offenses	Thomas Kriechbaumer	2016-05-28	6	-13/+11
\| \| \| \| \|
* \| \| \| \|	netlib: fix most flake8 offenses	Thomas Kriechbaumer	2016-05-28	10	-31/+43
\| \| \| \| \|
* \| \| \| \|	ignore sslkeylogfile.log	Thomas Kriechbaumer	2016-05-28	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	cleanup imports with flake8	Thomas Kriechbaumer	2016-05-28	33	-50/+29
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	fix Python 2 tests	Maximilian Hils	2016-05-28	1	-2/+2
\| \| \| \|
* \| \| \|	Enable Travis for test_log	Shadab Zafar	2016-05-28	1	-2/+2
\| \| \| \|
* \| \| \|	Py3: Use cStringIO from six.moves	Shadab Zafar	2016-05-28	1	-3/+3
\| \|_\|/ \|/\| \|
* \| \|	Fix crash in mitmproxy when viewing responses	Aldo Cortesi	2016-05-28	1	-1/+3
\|/ /
* \|	Merge pull request #1169 from gzzhanghao/contentview	Maximilian Hils	2016-05-27	7	-88/+112
\|\ \ \| \| \| \| \| \|	[web] Eliminate Router mixin and RawMixin
\| * \	Merge remote-tracking branch 'origin/master' into contentview	Jason	2016-05-28	32	-135/+253
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #1119 from dufferzafar/pathod-port	Maximilian Hils	2016-05-26	9	-43/+35
\|\ \ \ \| \| \| \| \| \| \| \|	Python 3 - pathod.utils
\| * \| \|	Enable travis Py3 testing for test_utils	Shadab Zafar	2016-05-26	1	-2/+2
\| \| \| \|
\| * \| \|	Go Python 3 by default with the bytes conversion	Shadab Zafar	2016-05-26	1	-2/+4
\| \| \| \|
\| * \| \|	remove str()	Shadab Zafar	2016-05-26	1	-1/+1
\| \| \| \|
\| * \| \|	Remove inner_repr, fixup escape_unprintables	Shadab Zafar	2016-05-26	2	-26/+8
\| \| \| \|
\| * \| \|	Use escaped_str functions for TokValueLiteral	Shadab Zafar	2016-05-26	1	-6/+7
\| \| \| \|
\| * \| \|	Remove Py3 specific check	Shadab Zafar	2016-05-26	1	-2/+1
\| \| \| \|
\| * \| \|	Use BytesIO in pathod app	Shadab Zafar	2016-05-26	1	-2/+2
\| \| \| \|
\| * \| \|	Py3: Handle bytes case in inner_repr	Shadab Zafar	2016-05-26	2	-1/+3
\| \| \| \|
\| * \| \|	Removed wrong import	Shadab Zafar	2016-05-26	1	-0/+1
\| \| \| \|
\| * \| \|	Py3: inner_repr and escape_unprintables	Shadab Zafar	2016-05-26	1	-2/+7
\| \| \| \|