Shadab Zafar
6a746deff5
Add tests for deletion of stickycookies
2016-07-09 22:20:25 +05:30
Shadab Zafar
608435cabf
Delete stickycookies when told by the server
...
Fixes #1096
2016-07-09 22:20:25 +05:30
Thomas Kriechbaumer
695c7368e6
Merge pull request #1299 from dufferzafar/py3-dump
...
Python 3 - test_dump
2016-07-09 10:17:24 +02:00
Maximilian Hils
3d40fae6d7
travis: move osx test to the top
...
OSX is the slow one, so it should start straight away.
2016-07-09 01:05:04 -07:00
Shadab Zafar
83a1cc5a9a
Make escape_control_characters handle strings on Py2
2016-07-09 13:28:20 +05:30
Shadab Zafar
bd58230178
Remove py35 section from tox.ini
2016-07-09 12:51:43 +05:30
Shadab Zafar
0a21d27004
strutils.hexdump returns native_strings
2016-07-09 12:43:21 +05:30
Shadab Zafar
c7cbbf5f0d
Set verbosity & flow_detail to 0
2016-07-09 12:32:41 +05:30
Shadab Zafar
147f61fa62
py3++
2016-07-09 11:14:12 +05:30
Shadab Zafar
b4469d2579
py3++: test_dump
2016-07-09 11:14:12 +05:30
Maximilian Hils
15c10d49f6
Merge pull request #1327 from mitmproxy/remove-script-context
...
Remove script context
2016-07-08 20:11:12 -07:00
Maximilian Hils
5d2b7c52f9
move script context to mitmproxy.ctx
2016-07-08 19:57:57 -07:00
Maximilian Hils
f7639e077a
py3++
2016-07-08 15:58:12 -07:00
Maximilian Hils
0a1431ed2c
fix #1314
2016-07-08 15:50:11 -07:00
Maximilian Hils
035f989890
Merge pull request #1330 from jpkrause/master
...
Added flow converters for versions 0.11 and 0.12
2016-07-08 15:29:37 -07:00
jpkrause
05ab9c1b37
Updated coding style and modified flow format compat test to use v0.11 and v0.10 dump files
2016-07-08 15:03:36 -07:00
jpkrause
c9482c6255
Added flow converters for versions 0.11 and 0.12
2016-07-08 12:46:28 -07:00
Thomas Kriechbaumer
819e737f0d
Merge pull request #1328 from Kriechi/fix-1326
...
http2: fix self-depended streams
2016-07-08 11:31:07 +02:00
Thomas Kriechbaumer
df43a962d7
simplify tox test exclusion
2016-07-08 10:54:21 +02:00
Thomas Kriechbaumer
6da166d762
http2: fix self-depended streams
2016-07-08 10:37:56 +02:00
Maximilian Hils
7c67faa8da
remove script contexts
2016-07-07 23:50:55 -07:00
Maximilian Hils
c048ae1d5b
remove context from all scripts
2016-07-07 20:14:52 -07:00
Maximilian Hils
7a5b21556b
fix tests
2016-07-07 19:34:57 -07:00
Maximilian Hils
00dce24015
tests++
2016-07-07 18:02:59 -07:00
Maximilian Hils
76473d44e0
py3++
2016-07-07 17:50:26 -07:00
Maximilian Hils
f62e976e1e
py3++
2016-07-07 17:29:22 -07:00
Thomas Kriechbaumer
acca8e5253
reorder travis jobs
2016-07-07 21:14:29 +02:00
Thomas Kriechbaumer
7baeac4d67
Merge pull request #1325 from Kriechi/dufferzafar-py3-h2
...
HTTP/2: Python 3-compatibility
2016-07-07 21:11:55 +02:00
Thomas Kriechbaumer
d962bd4e83
py3++
2016-07-07 20:25:48 +02:00
Shadab Zafar
c870d26bc7
py3++: test_protocol_http2
2016-07-07 16:39:25 +02:00
Maximilian Hils
a212ce1f63
py3++
2016-07-07 02:30:25 -07:00
Maximilian Hils
c57c203037
Merge pull request #1323 from mhils/test-examples
...
Exclude harparser script on Python 3
2016-07-07 01:31:06 -07:00
Maximilian Hils
f259b9478f
disable harparser on py3
2016-07-07 01:21:15 -07:00
Thomas Kriechbaumer
64ac2c73fe
Merge pull request #1318 from mhils/tnetstring3-unicode-type
...
[tests actually pass] Add unicode to tnetstring3
2016-07-07 09:48:22 +02:00
Maximilian Hils
605a4fd2fd
Merge pull request #1322 from linrock/json-api
...
Detect JSON API media type as a json content view
2016-07-06 21:26:38 -07:00
Linmiao Xu
275cf7a6c2
Detect JSON API media type as a json content view
...
IANA assignment here:
https://www.iana.org/assignments/media-types/application/vnd.api+json
More about JSON API:
https://github.com/json-api/json-api
2016-07-06 21:10:35 -07:00
Maximilian Hils
64a867973d
sni is now str, not bytes
2016-07-06 21:03:17 -07:00
Maximilian Hils
8287ce7e6d
fix tests
2016-07-06 19:55:48 -07:00
Maximilian Hils
2c37ebfc72
fix dump file cross compat between python versions
2016-07-06 19:55:48 -07:00
Maximilian Hils
d406bee988
tnetstring3: adapt to unicode support
2016-07-06 19:55:48 -07:00
Maximilian Hils
48ee3a553e
add tnetstring unicode type
2016-07-06 19:55:48 -07:00
Maximilian Hils
684b4b5130
tnetstring: keys are str on py3. migrate flow.io_compat
2016-07-06 19:55:48 -07:00
Maximilian Hils
e6e839d56d
add python3 tnetstring implementation
2016-07-06 19:55:25 -07:00
Maximilian Hils
9c873d63f4
py3++, multidict fixes
...
This commit improves Python 3 compatibility and fixes two multidict
issues:
1. Headers.items(multi=True) now decodes fields
2. MultiDict.clear(item) has been removed, as Python's
MutableMapping already defines .clear() with different
semantics. This is confusing for everyone who expects a
dict-like object. `.pop("attr", None)` is not fantastic,
but it's the Python way to do it.
2016-07-06 19:53:29 -07:00
Maximilian Hils
55fae7cea9
Merge pull request #1319 from mitmproxy/fix-py27-encoding-issues
...
Fix pathod log encoding
2016-07-06 17:35:34 -07:00
Maximilian Hils
444f0a4c39
py3++
2016-07-06 17:31:08 -07:00
Maximilian Hils
8b564bc934
fix pathod log encoding
2016-07-06 16:47:32 -07:00
Maximilian Hils
811b72cd30
blacklist pysftp 0.2.9
...
https://bitbucket.org/dundeemt/pysftp/issues/97/pysftp-029-breaks-builds
2016-07-06 13:01:24 -07:00
Maximilian Hils
38fd1d3ad7
fix issue introduced in 72f3b2b
2016-07-06 12:14:48 -07:00
Maximilian Hils
72f3b2bb17
minor code improvement
2016-07-05 19:32:25 -07:00
