Shadab Zafar
be306c8439
Py3: Use global next() function instead of iterator method
2016-06-06 00:07:44 +05:30
Thomas Kriechbaumer
ef462a05d7
Merge pull request #1213 from felixonmars/patch-1
...
Allow cryptography 1.4
2016-06-05 12:34:46 +02:00
Thomas Kriechbaumer
65fe397f3c
Merge pull request #1206 from Kriechi/improve-http2
...
improve http2
2016-06-05 10:10:28 +02:00
Felix Yan
ef363270b8
Allow cryptography 1.4
...
All tests passed and it works correctly here.
2016-06-05 00:04:24 -05:00
Aldo Cortesi
c0c45c051a
Fix test that may fail due to binary header data
...
This is just inherently not a determinisitc test. We don't use the log HTTP
interface any more, so it can just go. A more radical "solution" is inbound
shortly.
Fixes #1207
2016-06-05 11:47:52 +12:00
Thomas Kriechbaumer
2355c29c0e
Merge pull request #1209 from dufferzafar/pathod-lang-base
...
Python 3 - pathod.language.base
2016-06-04 15:57:22 +02:00
Shadab Zafar
f45765a236
Add test_language_base to tox.ini
2016-06-04 19:07:28 +05:30
Shadab Zafar
1de379be95
Enable Travis for test/pathod/test_language_base
2016-06-04 18:32:37 +05:30
Shadab Zafar
2dec2db756
Py3: Return path unescaped
...
[skip appveyor]
2016-06-04 18:31:31 +05:30
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
Thomas Kriechbaumer
1c4e1e049c
http2: remove custom PUSH_PROMISE header
2016-06-04 11:20:10 +02:00
Thomas Kriechbaumer
ac70eaed66
http2: improve GoAway handling
2016-06-04 11:20:10 +02:00
Thomas Kriechbaumer
7f4ac6f27b
http2: respect MAX_CONCURRENT_STREAMS by hold-off
2016-06-04 11:20:10 +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