Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity
6,243 Commits 1 Branch 67 Tags 50 MiB
f15a628561
Commit Graph

6243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
a12c3d3f8e restructure and move test files 
add empty test files to satisfy linter
 2017-02-14 23:31:37 +01:00
Thomas Kriechbaumer
04748e6f3f add filename-matching linter 2017-02-14 22:48:24 +01:00
Thomas Kriechbaumer
cd9cd8a195 update lint options 2017-02-14 22:44:55 +01:00
Maximilian Hils
a3436897ad Merge pull request #2024 from MatthewShao/fix_websocket_msg_in_console 
fix websocket message display crash in console.
 2017-02-14 18:02:09 +01:00
Maximilian Hils
5acdd78b15 fix typo 2017-02-14 17:45:54 +01:00
Matthew Shao
9b9d72594c fix websocket message display crash in console. 2017-02-14 21:21:39 +08:00
lymanZerga11
d30ef7ee3e Update test_flowlist.py 2017-02-14 21:17:18 +08:00
lymanZerga11
a52d8c1dab Update test_flowlist.py 2017-02-14 21:01:01 +08:00
Maximilian Hils
75a0a4c092 Merge pull request #2016 from Kriechi/pathod-refactor 
remove treq from pathoc
 2017-02-13 11:16:15 +01:00
Maximilian Hils
9c29f3b96d Merge pull request #2015 from Kriechi/nuke-pypy 
nuke pypy
 2017-02-13 11:16:02 +01:00
lymanZerga11
26a17a3d82 Update test_flowlist.py 2017-02-13 15:05:29 +08:00
lymanZerga11
a912d67c06 Update test_flowlist.py 2017-02-13 10:47:50 +08:00
lymanZerga11
577fb818b9 Update test_flowlist.py 2017-02-13 10:39:48 +08:00
lymanZerga11
f5b30b8872 Update test_flowlist.py 2017-02-12 23:36:26 +08:00
lymanZerga11
df8a5aa9be Update test_flowlist.py 2017-02-12 23:23:23 +08:00
lymanZerga11
c622e4a649 Create test_flowlist.py 2017-02-12 23:10:49 +08:00
lymanZerga11
55e471af40 Catch ValueErrors from url.parse() 2017-02-12 23:06:11 +08:00
Thomas Kriechbaumer
4771c9599e remove treq from pathoc 
Using a function intended only for tests in active live code is ugly.
However, this whole portion of pathoc could benefit from some further improvements.
 2017-02-12 13:10:51 +01:00
Thomas Kriechbaumer
63cfb4e480 nuke pypy 2017-02-12 12:32:30 +01:00
Alireza Mosajjal
f77cf03543 add version info to web footer (#2010) 
fixes #1893
 2017-02-12 10:06:44 +01:00
Maximilian Hils
3067a971f9 Merge pull request #2000 from s4chin/add-jpeg-parser 
Add jpeg parser
 2017-02-11 23:00:14 +01:00
Sachin Kelkar
245e24dcf3 Add sources of images, remove copyrighted image 2017-02-12 01:19:36 +05:30
Maximilian Hils
51f6d279a7 Merge pull request #2008 from yjh0502/master 
Add transparent proxy support for OpenBSD
 2017-02-11 12:00:02 +01:00
Maximilian Hils
e4cb96f84d consolidate readme shields 2017-02-11 11:54:59 +01:00
Sachin Kelkar
ccca04b450 Fix coverage 2017-02-11 15:01:54 +05:30
Jihyun Yu
4adc575bad Add transparent proxy support for OpenBSD 
Add transparent proxy support for OpenBSD with pf divert-to.
 2017-02-11 14:05:22 +09:00
Maximilian Hils
71742654e3 Merge pull request #2005 from ujjwal96/script-reload 
Closes #1828 script reloads on py file changes
 2017-02-11 01:45:14 +01:00
Maximilian Hils
d4593bc333 Merge pull request #2007 from mitmproxy/update-dependencies 
Update mypy
 2017-02-11 01:43:44 +01:00
Maximilian Hils
85542bd12b Merge pull request #2006 from Kriechi/coverage++ 
coverage++
 2017-02-11 01:43:27 +01:00
Maximilian Hils
705ffd6d06 update mypy 
The pypi package name has changed.
 2017-02-11 00:14:49 +01:00
Thomas Kriechbaumer
c8c79cc291 coverage++ 2017-02-10 22:55:15 +01:00
Sachin Kelkar
8eb1d34644 Add app1 marker and tests 2017-02-10 22:40:19 +05:30
Ujjwal Verma
809207195d closes #1828 script reloads on py file changes 2017-02-10 22:21:12 +05:30
Thomas Kriechbaumer
d4264cb719 Update .travis.yml 
otherwise `mitmproxy --version` fails because `git describe` might fail fetching the distance to the last release tag
 2017-02-10 16:37:22 +01:00
Maximilian Hils
d70f7cd8cc Merge pull request #2004 from mhils/update-dependencies 
update dependencies
 2017-02-10 15:28:10 +01:00
Maximilian Hils
43867dbd98 fix flaky coverage 2017-02-10 15:28:02 +01:00
Maximilian Hils
1c8836a8d6 update dependencies 2017-02-10 14:38:05 +01:00
Sachin Kelkar
c4e141a000 Add jpeg app0 sof0 com parsing 2017-02-10 11:16:23 +05:30
Maximilian Hils
74c991d70b Merge pull request #2002 from mitmproxy/content_views_edit 
Content views edit
 2017-02-09 23:21:44 +01:00
Ujjwal Verma
d6465b907f Closes #1580 Gives warning when explicit proxy configured in transparent mode (#1996) 2017-02-09 20:56:06 +01:00
Maximilian Hils
380ff50e57 Merge pull request #2003 from Kriechi/coverage++ 
test refactoring and coverage++
 2017-02-09 17:45:50 +01:00
Maximilian Hils
da8444b11f flow_count() -> len(flows) 2017-02-09 16:44:27 +01:00
Maximilian Hils
1084588103 Merge pull request #1998 from mhils/fix-change-upstream 
Fix change_upstream_proxy_server
 2017-02-09 16:39:20 +01:00
Thomas Kriechbaumer
d10560d54c improve coverage report 2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
2ff5d72236 minor changes 2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
0299bb5b2e eventsequence: coverage++ 2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
5a3976c43e coverage whitelist -> blacklist 2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
f6cea09d5a stateobject: coverage++ 2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
1847cf175c websockets, tcp, version: coverage++ 2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer
2134b5b06a remove FIXME 2017-02-09 16:08:35 +01:00