Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity
4,657 Commits 1 Branch 67 Tags 50 MiB
56af469b5a
Commit Graph

4657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
c7a891b652 Merge branch 'add_flow_to_options' 2016-06-15 13:40:03 -07:00
Maximilian Hils
94e2929b3f minor fixes 2016-06-15 13:39:56 -07:00
Shadab Zafar
7de5d7b298 Enable Travis for test/pathod/test_pathoc 2016-06-15 09:49:39 +02:00
Shadab Zafar
52fa195204 Unexpected spaces around = 2016-06-15 09:49:39 +02:00
Shadab Zafar
03ce09ca99 Py3: Split on byte newlines in pathod.log 2016-06-15 09:49:39 +02:00
Shadab Zafar
22a94f06e6 Py3: Find Content-Length header by bytes 2016-06-15 09:49:38 +02:00
Shadab Zafar
f83433e674 Py3: pathoc 2016-06-15 09:49:38 +02:00
Shadab Zafar
fa40531a80 Py3: pathod 2016-06-15 09:49:38 +02:00
Shadab Zafar
d9b940c21e Py3: websockets 2016-06-15 09:49:38 +02:00
Shadab Zafar
0f1aa2b78e Py3: fix http2 bytes issue 2016-06-15 09:49:38 +02:00
Clemens
48e372bf98 rename view -> ui, make code more readable 2016-06-15 08:54:55 +02:00
Clemens
00b4abfe83 add previous state to dispatch function 2016-06-15 00:19:33 +02:00
Clemens
003096b4cc code review 2016-06-14 22:17:34 +02:00
Maximilian Hils
26fe7dc87d Merge pull request #1257 from tdickers/master 
Make har_extractor.py output HAR 1.2 spec-compliant
 2016-06-14 10:03:13 -07:00
Tai Dickerson
c2d0910e59 Make har_extractor.py output HAR 1.2 spec-compliant 
HAR files were failing to load in harviewer (http://www.softwareishard.com/har/viewer/) due to:
- ISO 8601 dates for startedDateTime missing timezone (http://www.softwareishard.com/blog/har-12-spec/#pages)
-- Used UTC but could add detection of default system timezone if desired
- pages object missing pageTimings (http://www.softwareishard.com/blog/har-12-spec/#pageTimings)
-- Used {} because all child fields are optional
 2016-06-14 12:47:10 -04:00
Clemens
bf75e14573 added flowMenu 2016-06-14 11:20:48 +02:00
Aldo Cortesi
a63817f2b8 Merge pull request #1253 from mhils/fix-debug 
Fix Debug Mode on Windows
 2016-06-14 17:12:02 +12:00
Aldo Cortesi
04394ebd50 Merge pull request #1251 from cortesi/netlibrace 
Roll connect handlers and thread leak detection out in more of the netlib test suite
 2016-06-14 17:11:41 +12:00
Aldo Cortesi
93276d45be Merge branch 'master' into netlibrace 2016-06-14 16:29:15 +12:00
Aldo Cortesi
4c292b0197 Fix Python3 tests 2016-06-14 16:13:50 +12:00
Aldo Cortesi
d8ae2f1562 Merge pull request #1254 from mitmproxy/scriptargs 
Inline Scripts: use sys.argv instead of args argument.
 2016-06-14 15:25:01 +12:00
Aldo Cortesi
c2b5a13e3f Don't fail when start() is not defined 2016-06-14 14:39:07 +12:00
Aldo Cortesi
59aff68e7a Merge branch 'netlibrace' of github.com:cortesi/mitmproxy into netlibrace 2016-06-14 14:35:12 +12:00
Aldo Cortesi
50a20fefee Satisfy lint 2016-06-14 14:34:30 +12:00
Aldo Cortesi
9e63350a96 Use handlers in http2 test suite 2016-06-14 14:32:18 +12:00
Aldo Cortesi
e6fd98bb72 Start rolling out leak detection in netlib 2016-06-14 14:32:18 +12:00
Maximilian Hils
63c6660895 update examples, tests, docs 2016-06-13 18:17:09 -07:00
Maximilian Hils
804efe9d38 fix contextmanager, remove args argument to start() 2016-06-13 18:08:57 -07:00
Maximilian Hils
3c9a70b761 fix debug mode on Windows 2016-06-13 18:06:44 -07:00
Aldo Cortesi
e7b61995ad A tiny wrapper to make script invocations nicer 2016-06-14 12:34:22 +12:00
Aldo Cortesi
3c5b0491e6 Use handlers in http2 test suite 2016-06-14 12:09:13 +12:00
Aldo Cortesi
d7d532d6a6 Merge remote-tracking branch 'upstream/master' into netlibrace 2016-06-14 11:20:29 +12:00
Thomas Kriechbaumer
ccf4723505 Merge pull request #1242 from Kriechi/fix-1240 
fix #1240
 2016-06-12 14:17:30 +02:00
Thomas Kriechbaumer
a5aa16e03b fix #1240 2016-06-12 11:51:49 +02:00
Aldo Cortesi
a9c74bcb55 Start rolling out leak detection in netlib 2016-06-12 12:15:00 +12:00
Aldo Cortesi
e0d6434b27 Merge pull request #1247 from cortesi/appveyor 
Be stricter about handling connetcts in the pathoc test suite
 2016-06-12 11:35:20 +12:00
Aldo Cortesi
e58a2bf095 Merge branch 'master' into appveyor 2016-06-12 11:27:16 +12:00
Aldo Cortesi
dc545ca0f6 Make the tcp connection closer cancellable 
And use this to make pathoc error handling more sophisticated
 2016-06-12 11:17:05 +12:00
Aldo Cortesi
1d44030963 Merge pull request #1246 from cortesi/version 
Fold mitmproxy.version and pathod.version into netlib.version
 2016-06-12 10:40:10 +12:00
Aldo Cortesi
9bea616441 Be stricter about handling connetcts in the pathoc test suite 
Attempt to clear a niggling Appveyor exception buggering up our CI.
 2016-06-12 10:39:19 +12:00
Aldo Cortesi
728d5caa22 Fold mitmproxy.version and pathod.version into netlib.version 2016-06-12 10:29:12 +12:00
Thomas Kriechbaumer
c801f81373 Merge pull request #1243 from cortesi/debug2 
debug: On SIGUSR2, we dump tracebacks for all threads to screen
 2016-06-11 14:22:48 +02:00
Aldo Cortesi
e9f8eb1f6b Satisfy lint 2016-06-11 23:13:41 +12:00
Aldo Cortesi
7b86560ded debug: On SIGUSR2, we dump tracebacks for all threads to screen 2016-06-11 23:07:42 +12:00
Aldo Cortesi
8489c01ac8 Merge pull request #1241 from cortesi/debug 
Debug
 2016-06-11 22:22:02 +12:00
Aldo Cortesi
53b2fd545b Zap stray semicolon 2016-06-11 21:26:38 +12:00
Aldo Cortesi
5566a1f0e6 debug: num_fds is posix-only 2016-06-11 21:25:34 +12:00
Aldo Cortesi
0848d1085e debug: add OpenSSL 2016-06-11 21:06:41 +12:00
Aldo Cortesi
3f240b1875 debug: verison -> version 
@resam blew our sponsorship - t-mobile is up next
 2016-06-11 21:04:13 +12:00
Aldo Cortesi
09edbd9492 Improve debugging of thread and other leaks 
- Add basethread.BaseThread that all threads outside of test suites should use
- Add a signal handler to mitmproxy, mitmdump and mitmweb that dumps resource
information to screen when SIGUSR1 is received.
- Improve thread naming throughout to make thread dumps understandable
 2016-06-11 19:52:24 +12:00