728 Commits

Author	SHA1	Message	Date
Maximilian Hils	028f5c4929	downgrade pyparsing to fix #1087 and #1090	2016-04-21 17:11:28 -07:00
Maximilian Hils	423c076c61	cleanup mitmproxy.controller, raise Kill in Channel (#1085)	2016-04-14 12:03:29 -07:00
Maximilian Hils	bc60c26c7b	py3++	2016-04-13 22:34:28 -07:00
Maximilian Hils	70e35b7017	peer_address -> ip_address	2016-04-11 14:14:18 -07:00
Maximilian Hils	dcdee7dc46	server replay: keep --kill active	2016-04-09 16:47:05 -07:00
Maximilian Hils	0259f47997	Merge branch 'better-replace'	2016-04-03 08:17:30 -07:00
Thomas Kriechbaumer	f5fe93bf13	Merge pull request #1074 from mitmproxy/move-response-refresh ... move HTTPResponse.refresh into netlib	2016-04-03 10:16:39 +02:00
Thomas Kriechbaumer	16fdbb4f2f	Merge pull request #1073 from mitmproxy/first-line-format ... form_(in|out) -> first_line_format	2016-04-03 10:16:06 +02:00
Maximilian Hils	35a6d6e7f6	response.msg -> response.reason	2016-04-02 22:54:46 +02:00
Maximilian Hils	4e2acc4d9d	move HTTPResponse.refresh into netlib	2016-04-02 22:49:05 +02:00
Maximilian Hils	e6fa2688c9	form_(in|out) -> first_line_format	2016-04-02 21:57:35 +02:00
Maximilian Hils	610842cda5	fix FlowMaster.create_request, add test	2016-04-02 21:15:55 +02:00
Maximilian Hils	806aa0f41c	improve .replace() and move it into netlib	2016-04-02 14:38:33 +02:00
Maximilian Hils	4ee8808b44	add Serializeable.copy	2016-04-02 13:50:53 +02:00
Zohar Lorberbaum	cd2ef2fe13	merge	2016-03-28 10:17:58 -07:00
Zohar Lorberbaum	37483e228f	Merge remote-tracking branch 'mitmproxy/master' ... Merge with master	2016-03-28 10:06:02 -07:00
Zohar Lorberbaum	6d16f44ab7	Merge with master	2016-03-28 10:03:26 -07:00
Zohar Lorberbaum	e56198ae7c	cleaner target url	2016-03-28 09:51:06 -07:00
Zohar Lorberbaum	ef3d24e8c8	locust_task re-use locust_code.	2016-03-27 21:42:52 -07:00
Zohar Lorberbaum	9f77c80a32	pep8	2016-03-25 17:29:42 -07:00
Zohar Lorberbaum	5b07e8b3af	Add UI shortcuts.	2016-03-24 20:29:53 -07:00
Zohar Lorberbaum	a44062effb	Flow export to locust.io load test tool.	2016-03-23 01:49:18 -07:00
Maximilian Hils	403ac82a7d	netlib: request.path can be None	2016-03-20 23:22:50 +01:00
Maximilian Hils	726536689b	py3++	2016-03-20 22:58:35 +01:00
Maximilian Hils	2ce023a991	py3++	2016-03-20 22:50:03 +01:00
Maximilian Hils	88d365cfe6	py3++: cStringIO	2016-03-20 19:40:03 +01:00
Maximilian Hils	c52c59f858	port mitmproxy.scripts to py3	2016-03-19 19:53:27 +01:00
Maximilian Hils	4be9074b49	fix tests on OSX	2016-03-19 19:19:36 +01:00
Maximilian Hils	fb0b17ee93	simplify tests for @concurrent	2016-03-19 03:04:55 +01:00
Maximilian Hils	7e49b8c186	add tests for mitmproxy.script.reloader	2016-03-19 03:04:55 +01:00
Maximilian Hils	898f5d10b9	improve mitmproxy.scripts semantics, clean up tests	2016-03-19 03:04:55 +01:00
Maximilian Hils	983b0dd4f6	Merge pull request #1014 from ikoz/master ... New option: Add server certs to client chain	2016-03-17 02:28:00 +01:00
ikoz	9cc55f211f	Rename 'server' to 'upstream' in identifiers related to the AddServerCertsToClientChain feature	2016-03-16 19:20:18 +00:00
ikoz	d26c7f4ca5	Move more init things inside AddServerCertsToClientChainMixin	2016-03-16 18:43:51 +00:00
ikoz	efc3e942d5	Restructuring of the AddServerCertsToClientChain test so that it uses a Mixin - also removed some extra printf statements	2016-03-16 17:43:48 +00:00
Maximilian Hils	2a20fc59b2	Merge pull request #1030 from xhy940801/socks ... Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS	2016-03-16 12:16:52 +01:00
Thomas Kriechbaumer	0ab9e60168	Merge pull request #1019 from lilydjwg/master ... add resolved IP address in "Details" tab	2016-03-15 23:28:08 +01:00
ikoz	776e625413	Add tests for add-server-certs-to-client-chain feature	2016-03-15 14:58:38 +00:00
lilydjwg	eecadadce3	use "peer_address" instead of "sock_address"	2016-03-15 21:32:06 +08:00
yonder	ba933dff2c	Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS	2016-03-15 14:33:20 +08:00
lilydjwg	20ec502032	fix tests for "sock_address"	2016-03-14 22:17:12 +08:00
Shadab Zafar	5a1c3c4ad8	Update contentview test	2016-03-11 18:40:51 +05:30
Shadab Zafar	35204ecb1c	Move har_extractor tests to the examples file	2016-03-11 17:57:57 +05:30
Shadab Zafar	7c5791e51a	Use the contextmanager in all tests	2016-03-11 17:57:57 +05:30
Shadab Zafar	af9442a9ba	Add contextmanager to load an example	2016-03-11 17:57:57 +05:30
Shadab Zafar	b95cc63b87	Add tests for redirect_requests example	2016-03-11 17:57:57 +05:30
Shadab Zafar	2cd5392657	Add test for iframe_injector example	2016-03-11 17:57:57 +05:30
Shadab Zafar	ba1cf18f42	Add tests for custom_contentviews example	2016-03-11 17:57:57 +05:30
Shadab Zafar	5eca2223d5	Add tests for modify_response_body example	2016-03-11 17:57:57 +05:30
Shadab Zafar	c378fe2199	Remove missing import	2016-03-11 17:57:57 +05:30