Maximilian Hils
51bd98d5b1
make setup.py wheel-ready
2015-12-03 16:25:49 +01:00
Maximilian Hils
8ef0624b51
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-12-03 14:45:44 +01:00
Maximilian Hils
1619af1486
flow format compat: 0.14 -> 0.15
2015-12-03 14:45:26 +01:00
Maximilian Hils
b362e9a013
test flow conversion
2015-12-03 14:43:56 +01:00
Maximilian Hils
da50120502
appveyor: deploy binaries to snapshot server
2015-12-03 13:16:36 +01:00
Maximilian Hils
9c89bfbccc
appveyor: build binaries
2015-12-03 12:56:41 +01:00
Maximilian Hils
d1ce1aa993
fix #839
2015-12-02 21:19:41 +01:00
Maximilian Hils
7274edce05
travis: retry snapshot upload
2015-12-02 21:03:45 +01:00
Maximilian Hils
85b553724c
add tnetstring inspection tool
2015-12-02 19:59:02 +01:00
Maximilian Hils
3963a2191b
add import capability for old flows, fix #840
2015-12-02 19:50:08 +01:00
Maximilian Hils
b5d5e56fdb
remove docs from sdist
...
This has been broken anyway.
2015-11-29 19:07:27 +01:00
Maximilian Hils
ea3639209b
travis: don't install virtualenv manually
2015-11-29 15:26:24 +01:00
Maximilian Hils
f9c000ea6e
travis: fix osx binary build condition
2015-11-29 15:23:44 +01:00
Maximilian Hils
4c9fc2e3e9
travis: build binaries on osx
2015-11-29 15:11:08 +01:00
Maximilian Hils
f02da6448d
disable concurrency tests on appveyor
2015-11-29 03:13:08 +01:00
Maximilian Hils
bb62f5f3f5
lessen test race conditions
2015-11-29 02:59:25 +01:00
Maximilian Hils
0b06b02c92
add new pyinstaller spec files
2015-11-29 02:48:39 +01:00
Maximilian Hils
43ed82062f
fix #847
2015-11-27 21:21:04 +01:00
Maximilian Hils
6b92497d4f
remove unnecessary race conditions in tests
2015-11-27 01:11:06 +01:00
Maximilian Hils
abd8881491
add memoryleak debug script
2015-11-26 23:26:01 +01:00
Maximilian Hils
a88004f1ce
fix #831
2015-11-26 23:20:31 +01:00
Maximilian Hils
6a239526e5
http: catch all exceptions
2015-11-26 23:19:43 +01:00
Maximilian Hils
a9f64c22f8
simplify Client/ServerConnection.__repr__
2015-11-26 23:15:21 +01:00
Maximilian Hils
89013eb7af
establish tls with client even if server connection fails
2015-11-26 23:13:06 +01:00
Maximilian Hils
3eea7f1216
script reloader: minor fixes
2015-11-26 14:59:54 +01:00
Maximilian Hils
63355421ed
travis: add OSX tests
2015-11-26 14:59:43 +01:00
Maximilian Hils
5d332e7218
fix #842
2015-11-26 14:58:08 +01:00
Maximilian Hils
354f84c4c8
skip timing tests on appveyor
2015-11-24 19:07:04 +01:00
Maximilian Hils
d2f69da235
disable script reloader
...
This currently throws some errors on OSX.
2015-11-24 18:54:16 +01:00
Maximilian Hils
a561e3bd3d
Merge branch 'travis-contentviews'
2015-11-20 12:25:15 +01:00
Maximilian Hils
40b1819293
Merge pull request #836 from MatthewShao/fix#835
...
Fix #835 , can display unicode character correctly
2015-11-18 13:57:33 +01:00
Matthew Shao
b7bea03c68
fix #835 , can display unicode character correctly
2015-11-16 20:47:58 +08:00
Maximilian Hils
57cd9022d9
fix appveyor race conditions in tests
2015-11-14 22:14:18 +01:00
Maximilian Hils
d6bd1cb4a6
fix HTTPS Proxy-Authentication, refs #824
2015-11-14 21:55:02 +01:00
Maximilian Hils
0d98b9dcc5
finalize script reloading 🎉
2015-11-14 05:57:02 +01:00
Maximilian Hils
4499ab61c0
structure libmproxy.script
2015-11-14 04:21:38 +01:00
Maximilian Hils
247f27d821
minor stylistic fixes
2015-11-14 03:46:34 +01:00
Maximilian Hils
dce469d4c1
Merge pull request #833 from zbuc/contentview_scripts
...
Contentview scripts
2015-11-13 18:41:05 -08:00
Maximilian Hils
3cd709d982
Merge pull request #821 from zbuc/protobuf_contentview_test_fix
...
Fix failing protobuf contentview test
2015-11-13 18:35:10 -08:00
Chris Czub
e72a9a62a1
Feedback from PR #832
2015-11-13 16:55:27 -05:00
Chris Czub
d3feaa3bc6
Add custom content view plugin support for mitmproxy/mitmdump
2015-11-13 15:09:05 -05:00
Chris Czub
d7239d665e
Add new contentviews' content type mappings
2015-11-13 15:08:52 -05:00
Chris Czub
82a90511bc
Add "add" ContentView method & test
2015-11-13 15:07:56 -05:00
Maximilian Hils
f62d564cfb
be more conservative about dependency versions
...
We had various examples in the past where new releases break mitmproxy completely. Just as of today, the lxml guys pushed a new release to pypi, but did not include wheels - you cannot install mitmproxy on Windows without a compiler installed now.
2015-11-13 19:57:02 +01:00
Matthew Shao
cd0b9e01be
Decouple libmproxy.script from libmproxy.flow
2015-11-13 21:08:39 +08:00
Matthew Shao
2522ba69fa
Move the observer initalization to the constructor of Script
...
class.Should work with both mitmproxy and mitmdump now.
Change the names in PEP8 style.
2015-11-11 20:59:12 +08:00
Matthew Shao
3f6521f912
Use watchdog to reload scripts automatically.
2015-11-11 09:03:05 +08:00
Maximilian Hils
3739e1fe82
fix scripteditor bug
2015-11-10 04:48:30 +01:00
Maximilian Hils
59d3e9d954
docs++
2015-11-07 20:43:10 +01:00
Maximilian Hils
9298325ca5
Merge pull request #822 from ddworken/master
...
Added information on cert pinning (Fixes #689 )
2015-11-07 11:30:28 -08:00