Doug Freed
48b6964552
console: increase eventlog size limit to 10000
2016-12-12 15:41:31 +01:00
Aldo Cortesi
5cf268b012
Merge pull request #1842 from cortesi/optsave
...
Save options to file from console & related work
2016-12-12 12:53:26 +13:00
Aldo Cortesi
5e2a80fba1
Minor fixes
2016-12-12 12:18:33 +13:00
Maximilian Hils
d854e08653
[web] various fixes
2016-12-12 00:08:29 +01:00
Aldo Cortesi
a4ac5b158f
Merge branch 'master' into optsave
2016-12-12 11:13:32 +13:00
Maximilian Hils
980a84326b
InstallBuilder ( #1826 )
2016-12-11 23:07:47 +01:00
Aldo Cortesi
6dcd620c4a
Merge pull request #1838 from mhils/http2-is-difficult
...
Disable HTTP/2 by default, add explicit on/off switches
2016-12-12 09:17:06 +13:00
Aldo Cortesi
a99bf0814c
console: clean path prompt handling
...
- Don't trigger callback if no path is specified
- Expand userdir centrally
- Catch IO errors from callbacks and turn them into status messages
2016-12-12 09:13:43 +13:00
Maximilian Hils
a7d7ad2880
Merge pull request #1837 from mhils/1809
...
Fix #1809
2016-12-11 21:13:20 +01:00
Maximilian Hils
d1c7b203f0
[web] style flow menu
2016-12-11 19:59:54 +01:00
Aldo Cortesi
f8032bf85a
Replacements and SetHeaders are both defined as text in Options
...
Bytes don't play well with our config serialization or command-line args.
2016-12-12 07:39:59 +13:00
Aldo Cortesi
ca33bea296
Extend type checker validate Sequence specs
2016-12-12 07:39:59 +13:00
Aldo Cortesi
c5717b17df
console: add saving of config file
2016-12-12 07:39:59 +13:00
Maximilian Hils
6540aedaab
[web] style start menu
2016-12-11 18:49:28 +01:00
Maximilian Hils
f16aab963e
Merge pull request #1841 from mitmproxy/fix-docs-tests
...
pin docutils version to fix docs tests
2016-12-11 18:15:00 +01:00
Maximilian Hils
00ae4d3f6e
fix version sourcing in setup.py
2016-12-11 17:50:46 +01:00
Maximilian Hils
8f04225450
fix install.rst
2016-12-11 17:49:07 +01:00
Maximilian Hils
795e76eee2
[web] style options menu
...
The other menus are WIP.
2016-12-11 17:37:11 +01:00
Maximilian Hils
b92980efec
[web] show proxy address, add websocket toggle
2016-12-11 15:26:49 +01:00
Maximilian Hils
21eeaebc6b
pin docutils version to fix docs tests
2016-12-11 14:54:12 +01:00
Maximilian Hils
b62b92eabe
Merge pull request #1840 from mhils/1829
...
fix #1829
2016-12-11 14:50:20 +01:00
Maximilian Hils
610433f204
Merge pull request #1839 from mhils/1830
...
fix #1830
2016-12-11 14:50:13 +01:00
Maximilian Hils
bdba885922
fix #1829
2016-12-11 13:22:26 +01:00
Maximilian Hils
265ab7bf26
fix #1830
2016-12-11 13:11:02 +01:00
Maximilian Hils
4023327087
Merge pull request #1836 from Kriechi/wipeout-lxml
...
docs: update installation
2016-12-11 13:03:24 +01:00
Thomas Kriechbaumer
81b5788dfc
docs: update installation
2016-12-11 11:14:00 +01:00
Maximilian Hils
9139d55293
Merge pull request #1835 from Kriechi/bump
...
bump dependencies
2016-12-11 00:31:35 +01:00
Maximilian Hils
b24d9654a9
disable http2 by default, add explicit on/off switches
...
As long as major HTTP/2 implementers fail to implement the spec correctly,
we need to disable HTTP/2 by default. We expect this to be fixed with
the next release and re-enabled by default.
https://github.com/mitmproxy/mitmproxy/issues/1745
https://github.com/mitmproxy/mitmproxy/issues/1824
2016-12-11 00:29:35 +01:00
Maximilian Hils
782c66eac2
fix #1809
2016-12-10 21:36:31 +01:00
Thomas Kriechbaumer
036130868d
bump dependencies
2016-12-10 19:37:06 +01:00
Aldo Cortesi
8112bce424
Merge pull request #1831 from mhils/contentviews
...
Split contentviews.py into mitmproxy.contentviews
2016-12-11 07:33:27 +13:00
Maximilian Hils
b4a1bb44d9
minor fixes
2016-12-10 17:18:21 +01:00
Maximilian Hils
8df61c927e
Merge pull request #1834 from Kriechi/remove_ssl_match_hostname
...
remove backport.ssl_match_hostname
2016-12-10 17:03:18 +01:00
Thomas Kriechbaumer
7bae941ecc
remove backport.ssl_match_hostname
...
This is already included in Python 3.5+
2016-12-10 14:29:51 +01:00
Maximilian Hils
3e37cbd061
minor fixes
2016-12-10 12:06:33 +01:00
Maximilian Hils
123ef043dc
add new xml/html pretty-printer 🎉
2016-12-10 11:40:07 +01:00
Maximilian Hils
293b79af91
remove lxml-dependent code
2016-12-10 10:19:05 +01:00
Maximilian Hils
a7ba2f7b46
update tests, increase coverage, add type info
2016-12-09 21:26:02 +01:00
Maximilian Hils
f53f079f91
split contentviews.py into mitmproxy.contentviews
2016-12-09 19:02:55 +01:00
Maximilian Hils
d1c72574d5
Merge pull request #1827 from mhils/issue-1803
...
Fix #1803
2016-12-09 18:32:58 +01:00
Maximilian Hils
f0e9e4bab9
fix #1803
2016-12-09 17:18:26 +01:00
Aldo Cortesi
6792cc1de9
Merge pull request #1823 from cortesi/options2
...
options: add a merge method to assimilate options
2016-12-08 19:23:02 +13:00
Aldo Cortesi
e943147fc3
options: add a merge method to assimilate options
...
Fixes #953
2016-12-08 16:12:40 +13:00
Aldo Cortesi
fdd1e23875
Merge pull request #1822 from cortesi/clog
...
console: use an addon to capture logs
2016-12-08 13:42:14 +13:00
Aldo Cortesi
67e9de5f7f
console: use an addon to capture logs
...
Fix #1780
2016-12-08 10:47:45 +13:00
Aldo Cortesi
0a68613c8c
Merge pull request #1806 from cortesi/options
...
Options
2016-12-08 10:45:23 +13:00
Aldo Cortesi
b2695dbc6a
Minor tweaks
2016-12-08 10:21:06 +13:00
Aldo Cortesi
a617e3b5f7
Amalgamate all the Options objects
2016-12-08 10:21:06 +13:00
Aldo Cortesi
d742d4fb8c
Replace configargparse with argparse, enable new options loading
...
This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
6aacd27ab2
Add YAML serialization of options
...
This uses ruamel.yaml. The library seems well-supported, and can do in-place
modification of config files that retains user comments and file structure.
2016-12-08 10:21:06 +13:00
