Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity
6,211 Commits 1 Branch 67 Tags 50 MiB
b33d568e04
Commit Graph

6211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chhsiao90
a5f1215eb2 Allow underscore in hostname 2016-12-30 21:03:22 +08:00
Maximilian Hils
973406f327 Merge pull request #1896 from mhils/3.5.0-compat 
Fix compat with Python 3.5.0
 2016-12-28 15:35:07 +01:00
Maximilian Hils
eab360a02b fix IO type checking 2016-12-28 14:21:19 +01:00
Maximilian Hils
0929e74b4e fix compat with Python 3.5.0 2016-12-28 14:20:53 +01:00
Maximilian Hils
8185cf2724 update io compat for 2.0 2016-12-27 21:03:59 +01:00
Maximilian Hils
9e06c69ea3 Update README.md 2016-12-27 21:01:39 +01:00
Maximilian Hils
2a96d43602 Update README.md 2016-12-27 20:58:32 +01:00
Maximilian Hils
e531a97a8b bump version for next release cycle 2016-12-27 20:52:22 +01:00
Thomas Kriechbaumer
7221f49b25 Merge pull request #1887 from Kriechi/h2-enable 
enable HTTP/2 by default
 2016-12-27 20:49:09 +01:00
Maximilian Hils
843b1e17c9 add mitmweb to README 2016-12-27 20:47:47 +01:00
Maximilian Hils
6ae378aa20 bump version to 1.0.1 2016-12-27 19:26:28 +01:00
Maximilian Hils
141897c7fc turns out we need this 2016-12-27 19:14:46 +01:00
Maximilian Hils
c78ffbf16d fix url.parse tests for Python 3.6 
This is a simpler version of @Kriechi's patch.
 2016-12-27 19:09:56 +01:00
Thomas Kriechbaumer
51d57cfd4a py36: fix type information 2016-12-27 16:28:12 +01:00
Thomas Kriechbaumer
0bde932b78 run tests on Python 3.6 2016-12-27 16:28:12 +01:00
Maximilian Hils
38198769eb pyinstaller: use fixed bootloaders on linux 2016-12-27 03:09:43 +01:00
Thomas Kriechbaumer
cc9e70e3cc enable HTTP/2 by default 2016-12-26 21:51:10 +01:00
Maximilian Hils
2735338815 update windows dev script 2016-12-26 19:55:18 +01:00
Maximilian Hils
4b1224e592 add mitmweb explanation to introduction 2016-12-26 18:33:58 +01:00
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