Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity
4,578 Commits 1 Branch 67 Tags 50 MiB
48e372bf98
Commit Graph

4578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Clemens
bf75e14573 added flowMenu 2016-06-14 11:20:48 +02: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
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
Aldo Cortesi
5b9f07c81c debug.sysinfo: tests and coverage 2016-06-11 17:56:17 +12:00
Aldo Cortesi
e367b88195 Add a --sysinfo flag to all daemons 
This dumps all the platform information and mitmproxy version data we'd
normally need to troubleshoot an issue.
 2016-06-11 16:40:21 +12:00
Aldo Cortesi
4831e3e0bc Merge pull request #1238 from cortesi/toxfiddle 
Distinguish between CI and interactive versions of tox
 2016-06-11 16:24:12 +12:00
Aldo Cortesi
227d762cac Merge branch 'master' into toxfiddle 2016-06-11 16:08:14 +12:00
Aldo Cortesi
250b47487a tox: Pull Py3 test list out into an environment variable 
Suggestion from @resam
 2016-06-11 09:34:40 +12:00
Maximilian Hils
0b241a1da7 Merge remote-tracking branch 'jason/master' 2016-06-10 12:03:56 -07:00
Aldo Cortesi
3f7dc296c8 We're not using tox-travis any more - ditch it. 2016-06-10 20:05:18 +12:00
Aldo Cortesi
6da3ef48e0 Remove explicit versions in tox CI environments 
Tox matches the environment prefix against its std environs, so we don't need
to be explicit with versions here.
 2016-06-10 19:38:55 +12:00
Aldo Cortesi
bac3e87538 Distinguish between CI and interactive versions of tox 
- This patch changes tox so that local invocation runs the tests
with paralellism, coverage disabled, and without attempting to report coverage
upstream.

- You can now run specific tests for the py27 environment:

    tox -e py27 ./path/to/my/test

We can't do this for py35 just yet, because of our junk filter, and the fact
that we specify which tests to run directly in the conf file. Once these are
cleaned up, we can extend.
 2016-06-10 16:03:54 +12:00
Aldo Cortesi
11fb217191 Fix a crash when pathoc connections fail 
Use the new handler to tidy this up.
 2016-06-10 11:14:23 +12:00
Aldo Cortesi
120b6c0b59 Merge remote-tracking branch 'upstream/master' into pathodlog 2016-06-10 10:49:45 +12:00
Aldo Cortesi
2cf79b7912 Remove timestamps from pathoc output 
Pathoc is an interactive tool, no need for a long leading timestamp. More
generally, make timestamps optional in the logging mechanism so we can
configure this with command-line flags or something down the track.
 2016-06-10 10:47:28 +12:00
Jason
c33df55919 [web] update build 2016-06-09 20:39:51 +08:00
Jason
81a0c45c89 [web] header.js -> Header.js 2016-06-09 20:35:03 +08:00
Jason
6c95635cb8 [web] eventlog.js -> EventLog.jsx 2016-06-09 18:40:59 +08:00
Jason
1baefcdc99 [web] footer.js -> Footer.jsx 2016-06-09 18:13:18 +08:00
Jason
e24bf8d73f [web] fix shortcut for header fields 2016-06-09 18:03:40 +08:00
Jason
f306cfa8b6 [web] separate flowtable to multiple files 2016-06-09 17:52:30 +08:00
Maximilian Hils
52754f40c2 Merge pull request #1233 from gzzhanghao/master 
[web] ProxyApp and MainView with ES6
 2016-06-09 00:53:33 -07:00
Jason
6407765285 [web] update build 2016-06-09 14:22:23 +08:00
Jason
8e538c7630 [web] fix updateLocation 2016-06-09 14:20:14 +08:00
Jason
851bb4bf68 [web] rewrite ProxyApp and MainView with es6 2016-06-09 13:35:41 +08:00
Maximilian Hils
7707d096d2 fix default websocket state 2016-06-08 19:41:34 -07:00
Aldo Cortesi
9b0e31d312 Merge pull request #1232 from cortesi/odict 
Remove odict
 2016-06-09 13:59:26 +12:00
Aldo Cortesi
c421c41307 Remove odict 
- Adds default implementations for _kconv and _reduce_values to MultiDict.
Without these, operations fail in really, really non-obvious ways.
- Replace the remaining few instances of ODict

Fixes #1159
 2016-06-09 13:28:43 +12:00
Maximilian Hils
90cb84b536 Merge pull request #1220 from mitmproxy/add_sorting_with_redux 
Add sorting with redux
 2016-06-08 13:37:09 -07:00
Thomas Kriechbaumer
68f07911e0 properly fail on test failures 2016-06-08 19:46:13 +02:00
Maximilian Hils
f3f8dce5a0 Merge pull request #1230 from redfast00/master 
fix after cleanup of netlib.utils in mitmproxy.console.statusbar
 2016-06-08 10:15:55 -07:00
Thomas Kriechbaumer
696fe209e0 Merge pull request #1223 from dufferzafar/pathod-lang-http2 
Python 3 - pathod.language.http2
 2016-06-08 13:09:40 +02:00