cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	list mock as requirement (via @droope)	Maximilian Hils	2013-12-29	1	-0/+1
\|/ /
* \|	ignore web gui specific paths that won't get cleaned up when changing branches	Maximilian Hils	2013-12-17	1	-0/+2
* \|	merge smurfix/fix2, add serverconnect hook docs, adjust tests	Maximilian Hils	2013-12-16	9	-21/+60
\|\ \ \| \|/ \|/\|
\| *	Reconnect if the server-connect hook needs the request to decide what to do	Matthias Urlichs	2013-12-12	1	-4/+12
\| *	handle a hook changing connection parameters	Matthias Urlichs	2013-12-12	1	-1/+6
\| *	serverconnect hook: Set sc.request	Matthias Urlichs	2013-12-12	1	-2/+3
* \|	fix script path error in tests	Maximilian Hils	2013-12-15	2	-2/+14
* \|	add @concurrent decorator for inline scripts, fixes #176	Maximilian Hils	2013-12-15	6	-9/+128
* \|	Merge pull request #189 from mitmproxy/refactor_proxyhandler	Aldo Cortesi	2013-12-13	1	-74/+87
\|\ \ \| \|/ \|/\|
\| *	add comments	Maximilian Hils	2013-12-10	1	-1/+18
\| *	refactor ProxyHandler, remove duplicate code	Maximilian Hils	2013-12-10	1	-74/+70
* \|	add content-length 0 if we remove header for chunked encoding, fixes #186	Maximilian Hils	2013-12-12	2	-1/+14
* \|	change certificate path for android, fix #171	Maximilian Hils	2013-12-12	1	-2/+2
* \|	ignore missing CN in certificates. fixes #169	Maximilian Hils	2013-12-12	3	-1/+29
* \|	store resolved ip addresses, fixes #187	Maximilian Hils	2013-12-12	3	-3/+17
* \|	Merge pull request #190 from BillinghamJ/patch-1	Maximilian Hils	2013-12-11	1	-0/+3
\|\ \
\| * \|	Added small note of file format	James Billingham	2013-12-11	1	-0/+3
\|/ /
* \|	Merge remote-tracking branch 'origin/master'	Maximilian Hils	2013-12-11	2	-2/+2
\|\ \
\| * \	Merge branch 'master' of ssh.github.com:cortesi/mitmproxy	Aldo Cortesi	2013-12-10	1	-26/+19
\| \|\ \
\| * \| \|	Bump version	Aldo Cortesi	2013-12-10	2	-2/+2
* \| \| \|	add documentation on how to use custom certificates	Maximilian Hils	2013-12-11	1	-0/+14
\| \|/ / \|/\| \|
* \| \|	ensure binary read on windows	Maximilian Hils	2013-12-10	1	-1/+2
\| \|/ \|/\|
* \|	Merge remote-tracking branch 'origin/master'	Maximilian Hils	2013-12-09	1	-2/+2
\|\\|
\| *	Small workaround to make mitmproxy work again.	Aldo Cortesi	2013-12-09	1	-2/+2
* \|	remove code duplication in ProxyHandler by unifying read_transparent and read...	Maximilian Hils	2013-12-09	1	-25/+17
\|/
*	backport changes to fix tests	Maximilian Hils	2013-12-08	3	-5/+6
*	Merge branch 'master' into 0.10	Maximilian Hils	2013-12-08	6	-35/+61
\|\
\| *	Merge remote-tracking branch 'origin/master'	Maximilian Hils	2013-12-08	16	-98/+162
\| \|\
\| \| *	Merge pull request #134 from mhils/scripts_improvements	Aldo Cortesi	2013-12-08	12	-63/+101
\| \| \|\
\| \| * \	Merge pull request #166 from ghjc/forward-proxy	Aldo Cortesi	2013-12-08	2	-2/+21
\| \| \|\ \
\| \| \| * \|	Added -F http[s]://server:port option that allows MITM to forward traffic to ...	JC	2013-08-30	2	-2/+21
\| \| * \| \|	Merge pull request #170 from jsoriano/master	Aldo Cortesi	2013-12-08	1	-20/+17
\| \| \|\ \ \
\| \| \| * \| \|	New method establish_ssl to avoid duplicated code	Jaime Soriano Pastor	2013-09-26	1	-29/+15
\| \| \| * \| \|	Reverse proxy works with SSL	Jaime Soriano Pastor	2013-09-26	1	-2/+13
\| \| \| \|/ /
\| \| * \| \|	Remove obsolete test.	Aldo Cortesi	2013-12-08	1	-10/+0
\| \| * \| \|	Merge pull request #180 from mitmproxy/add_serverconnection_scripthook	Aldo Cortesi	2013-12-08	2	-0/+8
\| \| \|\ \ \
\| \| \| * \| \|	add serverconnect script hook	Maximilian Hils	2013-11-18	2	-0/+8
\| \| * \| \| \|	Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue	Aldo Cortesi	2013-12-08	1	-1/+1
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Fix divide by zero issue when timestamp start and end are the same	Rich Somerfield	2013-11-26	1	-1/+1
\| \| * \| \| \| \|	Add a note to the docs about pf redirection of traffic from the host itself.	Aldo Cortesi	2013-12-08	1	-0/+12
\| \| * \| \| \| \|	Merge branch 'fix_invalid_tcp_close'	Aldo Cortesi	2013-12-08	4	-3/+25
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	attempt to fix https://github.com/mitmproxy/netlib/issues/24	Maximilian Hils	2013-11-19	1	-2/+2
\| \| \| \|/ / /
* \| \| \| \| \|	Merge remote-tracking branch 'origin/0.10' into 0.10	Maximilian Hils	2013-12-08	5	-29/+34
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #161 from mitmproxy/external_webapp	Aldo Cortesi	2013-12-08	5	-29/+34
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	add option to expose webapp externally, remove distinct ip setting	Maximilian Hils	2013-08-18	5	-29/+34
* \| \| \| \| \| \| \|	Merge branch 'master' into 0.10	Maximilian Hils	2013-12-08	1	-4/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| / / / / / \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master'	Maximilian Hils	2013-12-08	1	-4/+3
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| / / / \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	Merge pull request #173 from joebowbeer/patch-1	Maximilian Hils	2013-10-22	1	-4/+3
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	Update android.html	joebowbeer	2013-10-18	1	-4/+3
\| \| \|/ / /
* \| \| / /	Merge branch 'master' into 0.10	Maximilian Hils	2013-09-14	12	-42/+103
\|\\| \| \| \| \| \|_\|/ / \|/\| \| \|