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,419 Commits 1 Branch 67 Tags 50 MiB
6ffe8b376e
Commit Graph

4419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shadab Zafar
6ffe8b376e Py3: Write bytes to file 2016-06-04 18:28:50 +05:30
Shadab Zafar
0d4437a404 Fix function name typo 2016-06-04 18:28:03 +05:30
Shadab Zafar
1c82231129 Use encode to detect if string is valid ASCII 2016-06-04 12:49:11 +02:00
Thomas Kriechbaumer
cfb5efc96f travis++ 2016-06-04 12:35:33 +02:00
Thomas Kriechbaumer
cc6b84dfc4 travis++ 2016-06-04 12:30:35 +02:00
Thomas Kriechbaumer
36c7fef134 add missing pathod files to travis 2016-06-04 12:27:46 +02:00
Thomas Kriechbaumer
c29bbbc29a Merge pull request #1208 from dufferzafar/pathod-lang-writer 
Python 3 - pathod.language.writer
 2016-06-04 12:01:19 +02:00
Shadab Zafar
bd7b275d44 Py3: Convert all data to bytes in pathod.language.writer test 2016-06-04 15:23:09 +05:30
Shadab Zafar
614a3d7a54 Py3: Use global next() instead of iterator method 2016-06-04 15:23:09 +05:30
Shadab Zafar
ae553ef472 Fix Docstring: "inject" can be an action too 2016-06-04 15:23:09 +05:30
Thomas Kriechbaumer
42930407ae improve travis 2016-06-04 11:25:47 +02:00
Maximilian Hils
e880f532ad web interleave old store and redux flow state 2016-06-04 00:58:13 -07:00
Maximilian Hils
c0d08be7a6 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-06-04 00:41:35 -07:00
Maximilian Hils
b02d66491c web: implement update and remove for list and view 2016-06-04 00:37:10 -07:00
Aldo Cortesi
d5532319c1 Basic ConsoleMaster tests, based on mastertester 2016-06-04 19:07:27 +12:00
Aldo Cortesi
af63a3e064 console/__init__.py -> console/master.py 2016-06-04 16:06:44 +12:00
Aldo Cortesi
12a4f9ecf9 Very basic test truss for web.app 2016-06-04 15:30:28 +12:00
Aldo Cortesi
f7f9cab5dc Rebase on master 2016-06-04 14:37:07 +12:00
Maximilian Hils
1b1ea98f08 web: add flows to redux state 2016-06-03 18:53:30 -07:00
Maximilian Hils
1b327f34c3 web: add redux list views 2016-06-03 18:38:25 -07:00
Maximilian Hils
ff9cc8b283 web: remove old event log store 2016-06-03 18:38:25 -07:00
Maximilian Hils
d6fcd7e06d web: implement redux store fetching 2016-06-03 18:38:25 -07:00
Thomas Kriechbaumer
46d9cdd70a fix style 2016-06-03 18:57:46 +02:00
Maximilian Hils
e31aa39fc2 Merge branch 'redux-ducks' 2016-06-02 23:45:36 -07:00
Maximilian Hils
65fde7f554 Merge pull request #1190 from mitmproxy/file_menu_save_open 
File menu save open
 2016-06-02 23:42:35 -07:00
Maximilian Hils
5321f15def web: fix eventlog height registration 2016-06-02 23:41:32 -07:00
Maximilian Hils
7afac747a8 web: reduxify event log store 2016-06-02 23:40:30 -07:00
Maximilian Hils
7c63aa3708 web: reduxify WebSocket 2016-06-02 21:12:59 -07:00
Aldo Cortesi
1ab64da682 Merge pull request #1167 from xntrik/mark_filter 
implement a toggle for viewing marked flows only in console
 2016-06-03 15:05:18 +12:00
Aldo Cortesi
08e4cd2a40 Merge remote-tracking branch 'upstream/master' 2016-06-03 14:55:35 +12:00
Aldo Cortesi
25671b91bd Fix flow handling for mitmdump 
Fixes #1188
 2016-06-03 14:53:51 +12:00
Maximilian Hils
6a91ab166f remove reducers directory 2016-06-02 19:29:03 -07:00
Maximilian Hils
a2d13714a6 Merge pull request #1202 from Lukasa/track-down-crypto-problems 
Better debugging output.
 2016-06-02 19:12:05 -07:00
Aldo Cortesi
7191906ba8 Merge pull request #1192 from cortesi/testsuite 
WIP: Solidify pathod test suite
 2016-06-03 14:08:48 +12:00
Aldo Cortesi
28aa6f0564 Bush-leage revert: re-enable brew OpenSSL update 2016-06-03 13:58:03 +12:00
Aldo Cortesi
6943d7e397 More explicit name for the tcp.Server handler counter 2016-06-03 13:57:12 +12:00
Cory Benfield
010e3bb39d
Quiet mode is a lie! 2016-06-02 18:56:32 -07:00
Cory Benfield
179b6e3525
Better debugging output. 2016-06-02 18:42:15 -07:00
Maximilian Hils
734ec94554 slightly improve readme wording 2016-06-02 18:25:56 -07:00
Aldo Cortesi
0d4a930397 Try not updating OpenSSL for now 2016-06-03 12:46:48 +12:00
Maximilian Hils
698d38b28e web: 🐣 2016-06-02 17:46:18 -07:00
Aldo Cortesi
e584ef0c56 Make dev.sh noisy to troubleshoot OpenSSL travis issue 2016-06-03 12:37:20 +12:00
Aldo Cortesi
e60860e65d Make tcp.Client.connect return a context manager that closes the connection 2016-06-03 12:06:36 +12:00
Aldo Cortesi
36383a6146 Pathod websocket service threads should not be immortal 2016-06-03 11:58:05 +12:00
Aldo Cortesi
c5076f5e01 Implement a service connection handler counter, use it in Pathod test suite 
Lots of failures, but that's a good thing.
 2016-06-03 11:47:07 +12:00
Aldo Cortesi
c6d15904f3 Merge remote-tracking branch 'upstream/master' into testsuite 2016-06-03 10:19:22 +12:00
Thomas Kriechbaumer
b9ad7be5ac Merge pull request #1199 from dufferzafar/pathod-generator-hotfix 
Handle the slice object case in TransformGenerator.__getitem__
 2016-06-02 22:45:55 +02:00
Shadab Zafar
8e60a9bca9 Handle the slice object case in TransformGenerator.__getitem__ 2016-06-03 02:00:58 +05:30
Clemens
5e7fa349a9 final review done, nothing to change -> ready to merge 2016-06-02 21:01:22 +02:00
Maximilian Hils
9c6da08d00 fix dumpfile upload 2016-06-02 11:41:26 -07:00