Commit Graph

5942 Commits

Author SHA1 Message Date
Aldo Cortesi
cd6a4afc05 Bump changelog timestamp 2016-12-26 11:53:27 +13:00
Aldo Cortesi
37c97eeca5 Merge pull request #1865 from cortesi/admin
Release administrivia: changelog stub, contributors, bump to v1.0
2016-12-24 17:24:07 +13:00
Aldo Cortesi
5167d59d63 Merge branch 'master' into admin 2016-12-24 11:20:12 +13:00
Maximilian Hils
9f1cbe8746 add mitmweb and Windows compat to changelog 2016-12-22 02:55:07 +01:00
Thomas Kriechbaumer
24751965f9 remove output of dumper during tests 2016-12-21 23:22:14 +01:00
Thomas Kriechbaumer
a196493a7a remove output of webmaster during tests 2016-12-21 23:13:53 +01:00
Thomas Kriechbaumer
7a14a8cee5 Update CHANGELOG
update changelog
2016-12-21 22:50:53 +01:00
Maximilian Hils
0c18f7ec9e Update CHANGELOG 2016-12-21 22:47:17 +01:00
Thomas Kriechbaumer
42e9448ade reflow docs 2016-12-21 22:27:51 +01:00
Thomas Kriechbaumer
8fcf08b30f Merge pull request #1882 from mhils/docs
Docs: Add mitmweb, restructure installation
2016-12-21 22:24:16 +01:00
Thomas Kriechbaumer
7f33771b21 Merge pull request #1881 from mhils/fix-alpn-bytes
Always Decode ALPN Where Required
2016-12-20 21:27:23 +01:00
Maximilian Hils
18f2009074 update installation page
We emphasize the binary installation because that is usually the simplest
method to install mitmproxy on all major platforms.
2016-12-20 17:37:20 +01:00
Maximilian Hils
7de3507f9a docs: add mitmweb stub 2016-12-20 17:37:12 +01:00
Maximilian Hils
f997b7fe14 always decode alpn where required 2016-12-20 16:49:38 +01:00
Maximilian Hils
77cd9224f9 Merge pull request #1880 from mhils/1877
Fix #1877
2016-12-19 19:04:45 +01:00
Maximilian Hils
fc5783c20e Merge branch 'rename-log-example' 2016-12-19 16:21:29 +01:00
Maximilian Hils
98a079aa69 rename logging.py example. this conflicted with Python's stdlib 2016-12-19 16:21:17 +01:00
Maximilian Hils
4f3b50e417 fix io compat with previous releases 2016-12-19 16:19:37 +01:00
Maximilian Hils
fbce37054f fix #1877 2016-12-19 16:10:41 +01:00
Maximilian Hils
cbc0d3fd41 Merge pull request #1876 from mhils/1858
fix #1858
2016-12-19 15:19:02 +01:00
Maximilian Hils
c4e9000021 fix #1858 2016-12-19 01:15:10 +01:00
Thomas Kriechbaumer
504c289ad0 Merge pull request #1875 from Kriechi/dont-log-tracebacks
don't log full tracebacks
2016-12-17 22:53:05 +01:00
Maximilian Hils
975d1b87a3 fix #1867 (#1873) 2016-12-17 18:59:50 +01:00
Thomas Kriechbaumer
ea62521f03 Merge pull request #1874 from Kriechi/bump-h2
bump h2
2016-12-17 18:49:29 +01:00
Thomas Kriechbaumer
5cfc728d2e don't log full tracebacks 2016-12-17 18:28:34 +01:00
Thomas Kriechbaumer
c50feb6a40 bump h2
This takes care of https://github.com/python-hyper/hyper-h2/issues/422
2016-12-17 18:12:16 +01:00
Maximilian Hils
d4298cd747 Merge pull request #1871 from Kriechi/http2-gui
display ALPN information
2016-12-17 18:11:36 +01:00
Thomas Kriechbaumer
ffcf060928 display ALPN information 2016-12-17 17:40:11 +01:00
Thomas Kriechbaumer
07671440ba Merge pull request #1872 from mhils/appveyor
appveyor: don't build installer for PRs
2016-12-17 17:25:24 +01:00
Maximilian Hils
377be68cac appveyor: don't build installer for PRs 2016-12-17 16:01:44 +01:00
Thomas Kriechbaumer
39a251a988 Merge pull request #1870 from Kriechi/http2-timeouts
http2: faster timeouts
2016-12-17 10:45:34 +01:00
Thomas Kriechbaumer
3eac72f1a3 http2: faster timeouts 2016-12-17 10:34:53 +01:00
Aldo Cortesi
85e0e5da4c Compat 0.19 -> 1.0
0.19 was never released, but let's include a conversion for it anyway, since it
was the master version.
2016-12-17 11:01:40 +13:00
Aldo Cortesi
aa90fd359d Administrivia: docs for new config file, minor adjustments
For now, the config file docs basically say "it's YAML, read the source". We
should do better for the next release.
2016-12-17 10:57:13 +13:00
Aldo Cortesi
2fe7cf448d Release administrivia: changelog stub, contributors, bump to v1.0 2016-12-17 10:35:13 +13:00
Aldo Cortesi
fc724b6641 Merge pull request #1864 from cortesi/tdocs
Addon test docs, remove stray deprecated events
2016-12-17 10:29:27 +13:00
Aldo Cortesi
007aeef770 Addon test docs, remove stray deprecated events
Fixes #1572
2016-12-17 10:03:35 +13:00
Aldo Cortesi
c4929bbc19 Merge pull request #1863 from Kriechi/disable-h2c
disable h2c upgrades
2016-12-17 09:19:48 +13:00
Aldo Cortesi
cf15a3c3ef Merge pull request #1862 from mhils/remove-intercept-events
Remove intercept events, update view manually
2016-12-17 09:15:11 +13:00
Thomas Kriechbaumer
39a8d4dc22 disable h2c upgrades 2016-12-16 11:29:07 +01:00
Maximilian Hils
388fa7e716 remove intercept events, update view manually 2016-12-16 05:43:38 +01:00
Aldo Cortesi
6695ce4624 Merge pull request #1861 from cortesi/marking
console: mark view indiciator, fix empty flow list behaviour
2016-12-16 17:26:19 +13:00
Maximilian Hils
e769b1fa9a Merge pull request #1860 from cortesi/smokey
Catch occasional protocol errors in regular connect
2016-12-16 00:16:34 +01:00
Aldo Cortesi
e387c68b38 console: mark view indiciator, fix empty flow list behaviour
Fixes #1782
2016-12-16 11:57:45 +13:00
Aldo Cortesi
61e552553c Catch occasional protocol errors in regular connect
Fixes #1843 and #1847
2016-12-16 10:54:36 +13:00
Aldo Cortesi
6b5673e849 Merge pull request #1845 from mhils/mitmweb-improvements
Mitmweb Improvements
2016-12-16 10:04:12 +13:00
Thomas Kriechbaumer
78c78ce651 Merge pull request #1857 from mitmproxy/bump-cryptography
update dependencies
2016-12-14 19:38:53 +01:00
Maximilian Hils
1d846709c6 update dependencies 2016-12-14 18:19:49 +01:00
Maximilian Hils
727abdba44 Merge pull request #1852 from mhils/simplenamespace
Use types.SimpleNamespace instead of custom NS class
2016-12-13 15:06:14 +01:00
Maximilian Hils
e2c6d7ed0f Merge pull request #1851 from mhils/1850
fix #1850
2016-12-13 14:41:04 +01:00