Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-24 00:31:33 +00:00
Code Issues Projects Releases Wiki Activity
7,724 Commits 1 Branch 67 Tags 50 MiB
717fbaa990
Commit Graph

7724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldo Cortesi
659fceb697 minor fixes 2018-04-03 10:26:09 +12:00
Aldo Cortesi
7e73e5fa51 asyncio: factor out test server startup wait 2018-04-03 09:46:11 +12:00
requires.io
c5881c0dc9 [requires.io] dependency update 2018-04-02 20:49:26 +02:00
itzikBraun
29f4164344 added option to export request as httpie command 2018-04-02 12:57:33 +02:00
Aldo Cortesi
14f461c5d5 asyncio: cleanup and lint 
Also fix a racy websocket test.
 2018-04-02 16:41:49 +12:00
Aldo Cortesi
1f33c1c1a5 asyncio: rebase mitmweb Tornado event loop on asyncio 2018-04-02 15:00:13 +12:00
Aldo Cortesi
a3da43d3e5 asyncio: test cleanup 
Also silence asyncio logs. We sometimes end up with messages on the queue that
need to be ignored when the proxy shuts down, and asyncio complains loudly
about this.
 2018-04-02 14:51:14 +12:00
Aldo Cortesi
2ac4f9e255 asyncio: shift console over to asyncio eventloop 2018-04-02 11:21:52 +12:00
Aldo Cortesi
2b040ff093 asyncio: make http2 tests pass 2018-04-02 11:03:05 +12:00
Aldo Cortesi
28a8ddc0e8 asyncio: fix a few remaining issues in proxy/test_server.py 2018-04-02 09:46:02 +12:00
Aldo Cortesi
3cc5d81a4a asyncio: fix channel interface and tests 
We now need to synthesize a tick event when changing addons in tests, because
tick is asynchronously called on the event loop.
 2018-04-01 11:37:35 +12:00
Aldo Cortesi
b6d943cfa3 asyncio: fix client replay 2018-04-01 09:46:32 +12:00
Aldo Cortesi
54170ee657 asyncio: start a test loop for unit tests 
Also move signal handling out of master. These only work in the main thread,
and properly belong in main.py.
 2018-04-01 09:46:32 +12:00
Aldo Cortesi
d9752c90f9 Remove support for Python 3.5 
There are a number of significant improvements in Python3.6 - especially in
asyncio - that makes ditching Python 3.5 compelling. The next Ubuntu LTS will
be released before the next version of mitmproxy, and will include Python 3.6
in base.

This patch removes support for testing under Python 3.5 and changes our
documentation. There are deeper changes in the type system and so forth that we
will make over time.
 2018-04-01 09:46:32 +12:00
Aldo Cortesi
976b2018a3 asyncio: clean up event loop acquisition 
We now acquire the event loop through asyncio.get_event_loop, avoiding having
to pass the loop explicity in a bunch of places. This function does not return
the currently running loop from within coroutines in versions of Python prior
to 3.6.
 2018-04-01 09:46:32 +12:00
Aldo Cortesi
a2d4519354 asyncio: brutally rip out our old queue mechanism 2018-04-01 09:46:32 +12:00
Thomas Kriechbaumer
b5c3883b78
Update dev.ps1 2018-03-31 23:45:33 +02:00
Aldo Cortesi
53827a36ae
Merge pull request #3025 from Kriechi/py36 
Python 3.5 is dead -- long live Python 3.6!
 2018-04-01 08:59:47 +12:00
Thomas Kriechbaumer
7edf4ad655
Merge pull request #3026 from ghillu/master 
Update addons-overview.md
 2018-03-31 21:14:06 +02:00
ghillu
673b58c79f
Update addons-overview.md 
Fixed a typo
 2018-04-01 00:09:45 +05:30
Thomas Kriechbaumer
46f8901b8c Python 3.5 is dead -- long live Python 3.6! 
fixes #2266
 2018-03-31 18:46:32 +02:00
Aldo Cortesi
3c52ed6ee1
Merge pull request #3012 from Kriechi/docs-options 
docs: add auto-generated options reference
 2018-03-30 09:38:17 +13:00
Maximilian Hils
c6cf502657
simplify README 2018-03-28 13:28:53 +02:00
Thomas Kriechbaumer
79fc4e8ad6
fix badges 2018-03-27 17:25:15 +02:00
Thomas Kriechbaumer
3ae9407a38
fix docs-related URLs 2018-03-27 17:23:01 +02:00
Thomas Kriechbaumer
8f30c8debd
Merge pull request #3014 from MikeShi42/patch-1 
Fixed Typo in Transparent Proxy Setup for Mac
 2018-03-27 09:42:26 +02:00
Michael Shi
f6b616aa89
Fixed Typo in Transparent Proxy Setup for Mac 
Fixed typo referencing `en2` when it should mention `en0`
 2018-03-26 21:30:14 -07:00
kira0204
22b5149777 use error handler function 2018-03-26 03:28:28 +05:30
Thomas Kriechbaumer
f6699792da docs: add auto-generated options reference 2018-03-25 13:42:55 +02:00
Maximilian Hils
0e62e386c0 docs: add skeleton for options script 2018-03-24 23:14:58 +01:00
Miheer Dewaskar
9ee96f0227 Merge master 2018-03-24 10:49:08 -04:00
Thomas Kriechbaumer
2859ee2fa8
Merge pull request #3010 from Kriechi/bump-tornado 
fix Tornado 5.0 event loop
 2018-03-24 11:41:21 +01:00
Thomas Kriechbaumer
eb297d82aa fix Tornado 5.0 event loop 
https://github.com/tornadoweb/tornado/issues/2183#issuecomment-371001254
 2018-03-24 11:19:04 +01:00
Thomas Kriechbaumer
f34932c171
[requires.io] dependency update on master branch (#2992) 2018-03-24 10:42:49 +01:00
Maximilian Hils
2e8bc12795
Merge pull request #3008 from mhils/issue-2969 
Don't crash if server address is unknown, fix #2969
 2018-03-23 14:46:17 +01:00
Maximilian Hils
fed54fa3d0 don't crash if server address is unknown, fix #2969 2018-03-23 04:26:46 +01:00
Maximilian Hils
623f9b694d fix cloudfront invalidation paths 2018-03-21 13:47:15 +01:00
Maximilian Hils
2dd8ad36ae
Merge pull request #3004 from mhils/docs-improvements 
Docs Improvements
 2018-03-21 00:51:23 +01:00
Maximilian Hils
4eb6954c7d various docs improvements 
- add clickable anchors for headers
- add "outdated" warning for archived docs
- add "edit on github" button
- beautify template
 2018-03-21 00:42:37 +01:00
Maximilian Hils
c6932cbde5
update mitmweb dev instructions 2018-03-20 18:33:51 +01:00
Maximilian Hils
9748487939 improve transparent mode docs 2018-03-20 16:00:23 +01:00
Maximilian Hils
252684e14e minor docs fixes 2018-03-20 16:00:02 +01:00
Maximilian Hils
885d3d5da4 add google analytics 2018-03-20 15:58:48 +01:00
Maximilian Hils
7c66c4eb16 abort doc scripts on error 2018-03-20 15:04:31 +01:00
Maximilian Hils
dc3c400b6b add README for docs install 2018-03-20 15:00:29 +01:00
Aldo Cortesi
cba380de80
Merge pull request #2995 from cortesi/bench 
bench: Add some very simple manual benchmarking helpers
 2018-03-19 09:39:25 +13:00
Maximilian Hils
caed8e67d1
Merge pull request #2999 from fenilgandhi/Fix-2953 
Remove Highlight from status bar
 2018-03-18 21:03:11 +01:00
Maximilian Hils
a148b52548
minor improvements 2018-03-18 21:02:53 +01:00
Fenil Gandhi
ef1c1239dc Remove Highlight from statusbar 2018-03-19 01:10:08 +05:30
Maximilian Hils
3c7725a8ce
Merge pull request #2997 from jplochocki/patch-1 
Update cut.py
 2018-03-18 16:48:50 +01:00