6221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Kriechbaumer	1a36efbb6a	simplify ALPN and OpenSSL on macOS	2016-12-04 11:04:06 +01:00
Thomas Kriechbaumer	741c2b7b66	fix whitespace	2016-12-03 16:55:56 +01:00
Thomas Kriechbaumer	e9fa786fa9	fix indentation	2016-12-03 16:53:13 +01:00
Thomas Kriechbaumer	1fcf79fff0	fix ALPN usage	2016-12-02 11:58:20 +01:00
Maximilian Hils	d658783dec	Merge pull request #1797 from Kriechi/websocket++ ... Pass Autobahn WebSocket Test Suite	2016-12-01 09:28:18 +01:00
Thomas Kriechbaumer	cc6aa1f542	websocket: update close handshake tests	2016-11-29 23:47:19 +01:00
Thomas Kriechbaumer	d2216801dd	websocket: make flowfilter work	2016-11-29 23:01:55 +01:00
Thomas Kriechbaumer	ea6de424a3	websocket: carry over per-message compression bit	2016-11-29 22:32:55 +01:00
Thomas Kriechbaumer	073a286098	websocket: reduce connection timeout	2016-11-29 22:17:33 +01:00
Thomas Kriechbaumer	bd8ae910d2	websocket: fix message type on chunking	2016-11-29 22:13:59 +01:00
Thomas Kriechbaumer	6e15e766c5	websocket: fix close handshake and re-chunking	2016-11-29 22:01:41 +01:00
Thomas Kriechbaumer	5ee192b758	websocket: fix empty frame with fin=1	2016-11-29 21:00:42 +01:00
Maximilian Hils	34bf3a2496	fix #1783 (#1794)	2016-11-28 13:29:06 +01:00
Maximilian Hils	e64d2ce829	Merge pull request #1792 from Kriechi/mitmdump-filter-help ... improve mitmdump filter help	2016-11-28 02:13:39 +01:00
Maximilian Hils	3154dc87fd	fix pyinstaller ... amongst other things, fix #1746	2016-11-28 00:51:52 +01:00
Thomas Kriechbaumer	b5daafb518	improve mitmdump filter help	2016-11-25 21:59:13 +01:00
Maximilian Hils	568f40c810	Fix transparent mode initialisation, refactor mitmproxy.platform (#1787)	2016-11-25 17:32:23 +01:00
Maximilian Hils	0386740404	mitmweb: include console logging	2016-11-25 17:20:14 +01:00
Maximilian Hils	1d3cb9eeb8	mitmweb: add --no-browser	2016-11-25 17:20:14 +01:00
Maximilian Hils	e3dc46a8cd	fix pyinstaller (#1788)	2016-11-25 16:46:49 +01:00
Maximilian Hils	de9e724a66	update dependencies (#1789)	2016-11-25 16:46:00 +01:00
Maximilian Hils	222106916e	Merge branch 'mitmweb-eventlog'	2016-11-23 22:47:50 +01:00
Maximilian Hils	d15ddfad14	fix contentview attributes	2016-11-23 22:47:36 +01:00
Maximilian Hils	5d209e5040	Merge commit '9bc5adf'	2016-11-23 22:45:21 +01:00
Maximilian Hils	45332006a3	mitmweb: 100% app test coverage, numerous fixes	2016-11-23 22:35:07 +01:00
Thomas Kriechbaumer	48d54e2d4a	bump cryptography dependency	2016-11-23 11:55:11 +01:00
Thomas Kriechbaumer	9bc5adfb03	add more websocket indicators to mitmproxy and mitmdump	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	4b04566a34	add metadata info to flow detail view	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	ea97f62975	websocket: show messages in the eventlog	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	3353aa3cfd	fix docs	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	d3bd04dec0	disable TCP support for now	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	5dfc199086	websocket: add tests	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	4beb693c9c	websocket: change cmdline option	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	aaa4ccc284	websocket: add event documentation	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	3d8f3d4c23	add WebSocket flows and messages	2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer	ffb3988dc9	rename WebSocket{s,} protocol	2016-11-23 10:18:45 +01:00
Maximilian Hils	dc75605e46	minor fixes	2016-11-23 01:27:52 +01:00
Maximilian Hils	f1662cbfd7	add eventstore tests	2016-11-23 01:27:51 +01:00
Maximilian Hils	72dcf70db2	mitmweb: fix event display	2016-11-23 01:27:51 +01:00
Maximilian Hils	fea6041cde	mitmweb: cleanup, reimplement eventlog	2016-11-23 01:27:50 +01:00
Maximilian Hils	a6c608e085	make the new mypy release happy	2016-11-23 01:27:23 +01:00
Maximilian Hils	8ba5f40d76	Update README.md	2016-11-22 23:30:57 +01:00
Maximilian Hils	39b24a5bab	Update README.md	2016-11-22 23:11:57 +01:00
Maximilian Hils	40f0193dda	remove mitmweb auth ... 9b08279c7c removed the actual functionality. we should not have a command line switch that does nothing. :)	2016-11-22 18:27:16 +01:00
Maximilian Hils	21a03d56b5	don't set an empty ALPN, refs #1772	2016-11-22 17:02:37 +01:00
Maximilian Hils	92516a3b5c	Merge pull request #1769 from mhils/update-pydivert ... update pydivert, fix #1749	2016-11-21 14:40:11 +01:00
Maximilian Hils	f644665cd9	update pydivert, fix #1749	2016-11-21 14:14:52 +01:00
Yoginski	ebff5f2466	Descriptive error message for SSL context initialization failure (#1767)	2016-11-21 09:40:09 +01:00
Maximilian Hils	c90405253a	remove stickycookie example ... The recommended way to do this is mitmproxy/addons/stickycookie.py	2016-11-21 02:46:25 +01:00
Maximilian Hils	2138be8705	Merge pull request #1768 from mhils/organize-examples ... Organize Examples	2016-11-21 02:42:15 +01:00