2487 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maximilian Hils	c6d849f7f5	Merge pull request #855 from jvillacorta/master ... Add default ciphers to avoid issue with iOS9 App Transport Security	2015-12-11 17:13:32 +01:00
Jorge Villacorta	ba53c7c9a2	Add default ciphers to avoid issue with iOS9 App Transport Security	2015-12-11 11:09:02 -05:00
Maximilian Hils	f446dc4b83	Merge pull request #853 from dweinstein/warnings-to-stderr ... TLS verification warnings write to stderr	2015-12-10 17:49:24 +01:00
David Weinstein	78fc092b94	TLS verification warnings write to stderr	2015-12-10 11:43:58 -05:00
Aldo Cortesi	3b38fd86d2	Merge commit '5db6275'	2015-12-04 11:20:18 +13:00
Aldo Cortesi	5db6275c63	Changelog	2015-12-04 11:19:24 +13:00
Maximilian Hils	37903f69a0	setup.py: document that we don't want to use '~='	2015-12-03 19:58:35 +01:00
Maximilian Hils	47b2beb48b	use latest netlib version for snapshots	2015-12-03 18:42:02 +01:00
Maximilian Hils	5272979774	remove docs directory from sdist	2015-12-03 18:19:44 +01:00
Maximilian Hils	e6bf033cbd	bump version	2015-12-03 18:13:24 +01:00
Maximilian Hils	946bc05187	use version specifiers compatible with old setuptools releases	2015-12-03 17:57:29 +01:00
Maximilian Hils	46ae8b0e30	Revert "make setup.py wheel-ready" ... This reverts commit 51bd98d5b1.	2015-12-03 17:28:52 +01:00
Maximilian Hils	51bd98d5b1	make setup.py wheel-ready	2015-12-03 16:25:49 +01:00
Maximilian Hils	8ef0624b51	Merge branch 'master' of https://github.com/mitmproxy/mitmproxy	2015-12-03 14:45:44 +01:00
Maximilian Hils	1619af1486	flow format compat: 0.14 -> 0.15	2015-12-03 14:45:26 +01:00
Maximilian Hils	b362e9a013	test flow conversion	2015-12-03 14:43:56 +01:00
Maximilian Hils	da50120502	appveyor: deploy binaries to snapshot server	2015-12-03 13:16:36 +01:00
Maximilian Hils	9c89bfbccc	appveyor: build binaries	2015-12-03 12:56:41 +01:00
Maximilian Hils	d1ce1aa993	fix #839	2015-12-02 21:19:41 +01:00
Maximilian Hils	7274edce05	travis: retry snapshot upload	2015-12-02 21:03:45 +01:00
Maximilian Hils	85b553724c	add tnetstring inspection tool	2015-12-02 19:59:02 +01:00
Maximilian Hils	3963a2191b	add import capability for old flows, fix #840	2015-12-02 19:50:08 +01:00
Maximilian Hils	b5d5e56fdb	remove docs from sdist ... This has been broken anyway.	2015-11-29 19:07:27 +01:00
Maximilian Hils	ea3639209b	travis: don't install virtualenv manually	2015-11-29 15:26:24 +01:00
Maximilian Hils	f9c000ea6e	travis: fix osx binary build condition	2015-11-29 15:23:44 +01:00
Maximilian Hils	4c9fc2e3e9	travis: build binaries on osx	2015-11-29 15:11:08 +01:00
Maximilian Hils	f02da6448d	disable concurrency tests on appveyor	2015-11-29 03:13:08 +01:00
Maximilian Hils	bb62f5f3f5	lessen test race conditions	2015-11-29 02:59:25 +01:00
Maximilian Hils	0b06b02c92	add new pyinstaller spec files	2015-11-29 02:48:39 +01:00
Maximilian Hils	43ed82062f	fix #847	2015-11-27 21:21:04 +01:00
Maximilian Hils	6b92497d4f	remove unnecessary race conditions in tests	2015-11-27 01:11:06 +01:00
Maximilian Hils	abd8881491	add memoryleak debug script	2015-11-26 23:26:01 +01:00
Maximilian Hils	a88004f1ce	fix #831	2015-11-26 23:20:31 +01:00
Maximilian Hils	6a239526e5	http: catch all exceptions	2015-11-26 23:19:43 +01:00
Maximilian Hils	a9f64c22f8	simplify Client/ServerConnection.__repr__	2015-11-26 23:15:21 +01:00
Maximilian Hils	89013eb7af	establish tls with client even if server connection fails	2015-11-26 23:13:06 +01:00
Maximilian Hils	3eea7f1216	script reloader: minor fixes	2015-11-26 14:59:54 +01:00
Maximilian Hils	63355421ed	travis: add OSX tests	2015-11-26 14:59:43 +01:00
Maximilian Hils	5d332e7218	fix #842	2015-11-26 14:58:08 +01:00
Maximilian Hils	354f84c4c8	skip timing tests on appveyor	2015-11-24 19:07:04 +01:00
Maximilian Hils	d2f69da235	disable script reloader ... This currently throws some errors on OSX.	2015-11-24 18:54:16 +01:00
Maximilian Hils	a561e3bd3d	Merge branch 'travis-contentviews'	2015-11-20 12:25:15 +01:00
Maximilian Hils	40b1819293	Merge pull request #836 from MatthewShao/fix#835 ... Fix #835 , can display unicode character correctly	2015-11-18 13:57:33 +01:00
Matthew Shao	b7bea03c68	fix #835 , can display unicode character correctly	2015-11-16 20:47:58 +08:00
Maximilian Hils	57cd9022d9	fix appveyor race conditions in tests	2015-11-14 22:14:18 +01:00
Maximilian Hils	d6bd1cb4a6	fix HTTPS Proxy-Authentication, refs #824	2015-11-14 21:55:02 +01:00
Maximilian Hils	0d98b9dcc5	finalize script reloading 🎉	2015-11-14 05:57:02 +01:00
Maximilian Hils	4499ab61c0	structure libmproxy.script	2015-11-14 04:21:38 +01:00
Maximilian Hils	247f27d821	minor stylistic fixes	2015-11-14 03:46:34 +01:00
Maximilian Hils	dce469d4c1	Merge pull request #833 from zbuc/contentview_scripts ... Contentview scripts	2015-11-13 18:41:05 -08:00