Aldo Cortesi
0d59c2da97
Better error when invalid palette is specified
2015-03-12 22:56:47 +11:00
Aldo Cortesi
04e9260b74
Re-enable OSX binary builds for mitmproxy and mitmweb
2015-03-12 22:52:46 +11:00
Aldo Cortesi
40366fa94e
Virtualenv is the one and only recommended dev environment
...
- Create a "dev" script to create a virtualenv-based dev environment
- Update the docs to remove non-virtualenv install recommendations
- Update osx-binaries generation to use virtualenv
TODO:
- The dev script or an equivalent should be made to work on Windows
- We still can't remove the annoying top-level command scripts, because
pyinstaller doesn't support entry points. Once it does, they can go.
2015-03-12 22:12:15 +11:00
Aldo Cortesi
de3f84934d
Test suite should pass even if example dependencies are not present
2015-03-12 16:57:10 +11:00
Aldo Cortesi
dfc1b39164
Update for latest master of PyInstaller
2015-03-12 13:26:21 +11:00
Maximilian Hils
a8c074054a
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-11 13:11:55 +01:00
Maximilian Hils
937eb839ed
fix sourcemaps
2015-03-11 13:11:41 +01:00
Maximilian Hils
2f40a6fd78
improve source map generation
2015-03-11 11:13:20 +01:00
Maximilian Hils
ec4a6ec4e5
Merge pull request #509 from suyash/mitmweb-add-sourcemap-generation
...
add sourcemap generation for scripts-app-dev task
2015-03-08 21:09:06 +01:00
Wade Catron
803d631f04
Adding a server replay option to ignore host when searching for matching requests
2015-03-08 10:21:57 -07:00
Maximilian Hils
a78eb12e1a
Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation'
2015-03-07 01:42:06 +01:00
Maximilian Hils
15a8a93a4e
adjust to changed netlib api
2015-03-07 01:39:01 +01:00
Suyash
e47f9738ec
add sourcemap generation for scripts-app-dev task
2015-03-07 01:47:50 +05:30
Maximilian Hils
353a6ace47
Merge remote-tracking branch 'legend/master'
...
Conflicts:
libmproxy/web/static/app.js
2015-03-06 10:05:12 +01:00
Maximilian Hils
60dc5e0fe3
add mitmweb executable
2015-03-06 10:03:11 +01:00
Maximilian Hils
8c1978b7bf
Merge pull request #507 from legendtang/fix_flowactions
...
fix #506
2015-03-06 10:00:50 +01:00
Legend Tang
de306e6aeb
fix #506
2015-03-06 16:54:18 +08:00
Legend Tang
0b57f851bd
another clean up for #503 #504
2015-03-06 04:03:52 +08:00
Legend Tang
98c0047b4e
clean up for #503 #504
2015-03-06 03:57:38 +08:00
Legend Tang
36db55f662
Replace addListener method with multiple bindings, fix for #503 504
2015-03-06 03:45:58 +08:00
Legend Tang
b903dd4e4a
Revert "revert to custom EventEmitter, workaround for #504 "
...
This reverts commit fa8fc64ce0
2015-03-06 03:29:15 +08:00
Legend Tang
fa8fc64ce0
revert to custom EventEmitter, workaround for #504
...
It's an EventEmitter issue.
2015-03-06 02:51:57 +08:00
Maximilian Hils
300868edff
clean up web builds
2015-03-05 01:52:47 +01:00
Maximilian Hils
4c95c68041
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-04 23:07:04 +01:00
Maximilian Hils
f45f3dd4f1
update docs
2015-03-04 23:06:58 +01:00
Maximilian Hils
8f7ba4ab45
Merge pull request #500 from sunu/master
...
improvement to PR #496
2015-03-04 18:16:19 +01:00
Tarashish Mishra
48023db59e
Minor refactor to PR #496
2015-03-04 22:32:01 +05:30
Marcelo Glezer
b49d573c8b
sorted timing information by timestamp
2015-03-03 18:38:16 -03:00
Marcelo Glezer
485003511b
removed unused parameter
2015-03-03 17:49:47 -03:00
sentient07
ff6bfba4a6
Documentation for the client side certificate is added
2015-03-03 21:32:54 +05:30
Marcelo Glezer
8a672b7955
minor refactor
2015-03-03 00:55:23 -03:00
Marcelo Glezer
f514eacd7a
added timing information to FlowDetailView
2015-03-03 00:44:31 -03:00
Marcelo Glezer
58dba3f490
fixed formatting and added a 'test' (sort of)
2015-03-02 23:22:44 -03:00
Marcelo Glezer
91e5a4a4b5
#487 added microsecond support to format_timestamp and used in FlowDetailView. Still WIP.
2015-03-02 18:30:46 -03:00
Marcelo Glezer
8008a4336d
Merge pull request #2 from mitmproxy/master
...
update to mitmproxy/master
2015-03-02 14:37:30 -03:00
Maximilian Hils
e65a8659f0
Merge pull request #489 from tekii/feature-487
...
added time elapsed between request sent and response received
2015-03-02 14:40:22 +01:00
Maximilian Hils
75ba0a92e4
do some housekeeping
2015-03-02 14:35:50 +01:00
Maximilian Hils
7cf1ec7435
Merge pull request #493 from elitest/master
...
Adding support for server facing SSL cipher suite specification
2015-03-02 14:25:14 +01:00
elitest
5e07fe08ea
Update Server.py to fix SNI handling
...
Forgot to change ciphers->client_ciphers.
2015-03-02 00:19:06 -06:00
elitest
c6f54605a7
Update Config.py to clarify help messages
2015-03-01 20:49:03 -06:00
elitest
13e74facb6
Update config.py
2015-03-01 20:21:35 -06:00
Jim Shaver
ac92df0fda
Un-executable'd setup.py
2015-03-01 20:13:47 -06:00
Jim Shaver
b063d6020f
specified cipher_list in a few more locations, added a missing comma
2015-03-01 20:12:27 -06:00
Marcelo Glezer
09828ff2d9
changes requested by @mhils
2015-03-01 22:19:32 -03:00
Maximilian Hils
dff70150f5
Merge pull request #492 from mitmproxy/entrypoints
...
use entry_points for Windows support
2015-03-02 00:31:42 +01:00
elitest
6a1e294149
Update Server.py to improve cipher selection
...
Differentiated client ciphers and added server ciphers.
2015-02-28 11:07:18 -06:00
elitest
0b7b0ac33d
Update Config.py to improve cipher selection
...
added support for specifying cipher suites on both sides of the proxy instead of just the one.
2015-02-28 10:16:31 -06:00
Maximilian Hils
eec4c539f2
SSLKEYLOGFILE docs
2015-02-28 03:35:28 +01:00
Maximilian Hils
e1b6cf9401
fix #319
2015-02-27 15:24:27 +01:00
Maximilian Hils
8d975e80ff
Merge remote-tracking branch 'sakurai/feature/issue319'
2015-02-27 14:47:50 +01:00
