8121 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pierre Gordon	1b3f86e709	Verify ignore_hosts & allow_hosts are mutually exclusive	2019-04-19 13:10:39 -05:00
Pierre Gordon	8d0c800d15	Add --allow_hosts option ... Closes #3295	2019-04-19 12:39:53 -05:00
Anthony Biondo	a8489466c1	update formatdate for cookies and tests to use GMT formatting	2019-04-16 22:11:27 -04:00
Anthony Biondo	bcd1bb23f6	Fix #3502 by using email.utils.formatdate's usegmt argument.	2019-04-16 21:53:31 -04:00
Pierre Gordon	13ad81eaff	Remove the confdir argument ... Closes #3266	2019-04-09 15:23:07 -05:00
Maximilian Hils	8353f4a55a	Merge pull request #3480 from lusceu/master ... Updated exif kaitai files	2019-04-02 16:39:16 +02:00
Maximilian Hils	cbca131002	Merge pull request #3490 from rjt-gupta/rjt-gupta-update-readme ... Suggestion: Update Readme to improve testing	2019-04-02 16:29:39 +02:00
Maximilian Hils	6eb47a5fa5	simplify testing instructions	2019-04-02 16:29:14 +02:00
Samoilenko Roman	035c6ca2d5	Merge pull request #3509 from ohhorob/patch-1 ... Fix markdown typo on addons-scripting.md	2019-03-30 11:51:33 +02:00
Rob Wills	fad326a85f	Fix markdown typo on addons-scripting.md	2019-03-29 15:11:17 -07:00
Rajat Gupta	9b7c2566d3	Update README.rst	2019-02-28 23:59:50 +05:30
rjt-gupta	6e153b2c01	filter unicode fix	2019-02-24 01:45:45 +05:30
ls	0d108fac86	Fixed the exif .ksy files in the kaitai repo. Compiled the .ksy to python files and updated them in the contrib folder.	2019-02-17 23:26:20 +01:00
rjt-gupta	ba054b15f3	url-fix	2019-02-03 00:53:05 +05:30
rjt-gupta	cec8c67465	non ascii fix and tests	2019-02-03 00:49:53 +05:30
Thomas Kriechbaumer	70777a1b6e	Merge pull request #3459 from RPigott/wsproto-update ... Fix: update to wsproto 0.13 for real this time	2019-01-31 22:08:02 +01:00
rpigott	7fa209790e	removed whitespace in kwargs	2019-01-31 12:34:00 -08:00
rpigott	92fc87bc4c	whitespace error	2019-01-30 23:44:35 -08:00
rpigott	2af71a4486	Separate client and server PerMessageDefalte extension per #3460	2019-01-30 18:31:44 -08:00
rpigott	106948d996	update to wsproto 0.13	2019-01-29 12:09:05 -08:00
Thomas Kriechbaumer	67aa1b63f9	Merge pull request #3437 from yan12125/fix-tests-on-mojave ... Fix a failing test on macOS Mojave	2019-01-26 14:57:41 +01:00
Maximilian Hils	139a385900	Merge pull request #3441 from petersmythe/patch-1 ... Fix spelling issues	2019-01-23 13:08:51 +01:00
Maximilian Hils	79b9e0d1bf	Merge pull request #3451 from yjh0502/openbsd-doc ... openbsd: divert-to requires exact listen address	2019-01-23 13:08:25 +01:00
Maximilian Hils	5ad12e625b	Merge pull request #3453 from XZzYassin/patch-1 ... fixes copying on macos	2019-01-23 13:07:40 +01:00
Mumen Yassin	995d9f0f49	fixes copying on macos	2019-01-23 14:34:55 +03:00
Thomas Kriechbaumer	8b9583f19d	remove travis workaround	2019-01-18 19:52:24 +01:00
Thomas Kriechbaumer	63a5e1d3ae	remove sudo:false flag ... https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration	2019-01-18 19:47:45 +01:00
Jihyun Yu	c331ba91fc	openbsd: divert-to requires exact listen address ... divert-to does not work with '0.0.0.0' or similar listen address, so we need to specify listen address that we provided to `pf`.	2019-01-18 15:59:58 +09:00
Maximilian Hils	82bc8c7ca2	Merge pull request #3444 from BoboTiG/fix-resource-leaks ... Fix ResourceWarning: unclosed file, prevent resource leaks	2019-01-06 17:43:47 +01:00
Mickaël Schoentgen	c03b07930c	Fix ResourceWarning: unclosed file, prevent resource leaks ... Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>	2019-01-06 15:06:30 +01:00
Maximilian Hils	4f270b5506	Merge pull request #3443 from BoboTiG/fix-invalid-seq-warnings ... Fix several DeprecationWarning: invalid escape sequence	2019-01-06 14:19:45 +01:00
Mickaël Schoentgen	3a2d7bb119	Fix several DeprecationWarning: invalid escape sequence ... Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>	2019-01-05 23:37:48 +01:00
Peter Smythe	2223520403	Fix space	2019-01-03 08:48:09 +02:00
Peter Smythe	d6445fa5ba	Fix spelling	2019-01-03 07:54:57 +02:00
Chih-Hsuan Yen	cc33f40f29	Fix a failing test on macOS Mojave	2018-12-29 21:24:46 +08:00
BkPHcgQL3V	407a5d71a8	Tabular list flow	2018-12-19 17:52:32 +00:00
BkPHcgQL3V	889987aa0a	Fix Flow being part of raw_format_flow cache key ... raw_format_flow is annotated with the @lru_cache decorator, which creates a cache of the function's return value based on its parameters. Thus, assuming that the first argument (f) contains all the information needed to compute the urwid control for the flow, this effectively caches results. To make most use of this, remove the second parameter representing the real Flow object to improve @lru_cache's efficiency.	2018-12-17 18:25:14 +01:00
Rajat Gupta	e2bcca47b1	charset in meta tags (#3411) ... original contribution from @0xHJK in https://github.com/mitmproxy/mitmproxy/pull/3150	2018-12-13 15:34:12 +01:00
Rajat Gupta	db658b12ed	fix query array ... fixes #3072 closes #3254	2018-12-03 22:05:59 +01:00
Thomas Kriechbaumer	ce28721458	Merge pull request #3403 from Kriechi/bump-deps ... bump dependencies	2018-12-02 16:18:56 +01:00
Thomas Kriechbaumer	2fb2b48a06	bump dependencies	2018-12-02 15:48:20 +01:00
Thomas Kriechbaumer	544f859925	Merge pull request #3401 from rjt-gupta/fix-replay-timestamps ... client-replay-fix	2018-12-01 16:35:40 +01:00
rjt-gupta	39e5ceb6cf	client-replay-fix	2018-12-01 18:23:10 +05:30
Thomas Kriechbaumer	6f893a83c0	Merge pull request #3382 from abhigyank/org ... Change variable o to organization for generated certficates.	2018-11-12 09:34:16 +01:00
Abhigyan Khaund	cda4248610	Change variable o to organization for generated certficates.	2018-11-11 10:58:14 +05:30
Abcdefghijklmnopqrstuvwxyzxyz	d4f4cfe225	Add Organization field for the generated certificate (#3376) ... add organization field for the generated certificate	2018-11-09 09:06:04 +01:00
Maximilian Hils	3f3ed4743a	Merge pull request #3371 from JessicaFavin/proper-display-on-stderr ... Display errors on sys.stderr	2018-11-09 08:58:41 +01:00
Maximilian Hils	ef485fa5cc	Merge pull request #3374 from abhigyank/docs ... docs: Add mitm.it link in the certificates docs.	2018-11-09 08:57:05 +01:00
Maximilian Hils	08f2459cbd	docs: don't make links extra bold	2018-11-09 08:56:48 +01:00
Abhigyan Khaund	80f5cf5437	docs: Add mitm.it link in the certificates docs.	2018-11-05 02:15:48 +05:30