Commit Graph

8123 Commits

Author SHA1 Message Date
Miroslav
34dbd9adbb Flake, be happy 2018-02-20 21:45:14 +02:00
Miroslav
6c525317cc one more cleanup 2018-02-20 20:14:36 +02:00
Maximilian Hils
3934dbb5ad
update log_events example documentation 2018-02-20 17:15:35 +01:00
Maximilian Hils
29ef663aa1
add documentation for custom_option.py 2018-02-20 17:14:21 +01:00
Miroslav
aea6fd28c8 Hotkeys cleanup 2018-02-20 16:25:39 +02:00
Maximilian Hils
1d23d50a9d
Merge pull request #2873 from kajojify/contentviews_items
Fix a bug with two-words contentview modes
2018-02-20 01:54:27 +01:00
Maximilian Hils
da4c1ee625
Merge pull request #2881 from cortesi/refreshopt
option refresh_server_playback -> server_replay_refresh
2018-02-19 22:52:19 +01:00
Miroslav
d6d2f55a4f shlex.quote 2018-02-19 23:50:46 +02:00
Miroslav
4e03326ec5 quotes instead of join 2018-02-19 23:31:26 +02:00
Aldo Cortesi
e9bdada1f5 option replay_kill_extra -> server_replay_kill_extra
Continuing effort to collect all sever replay options under a commmon prefix.
2018-02-20 09:46:47 +13:00
Aldo Cortesi
8129b93bb0 option refresh_server_playback -> server_replay_refresh
All other server playback options have this form.
2018-02-20 09:30:29 +13:00
kira0204
d045f879ac Extensive testing 2018-02-19 22:56:52 +05:30
kira0204
fb54bb3777 Testing 2018-02-19 22:45:30 +05:30
Maximilian Hils
a9402975dc
Merge pull request #2878 from PaleNeutron/patch-1
Remove heading_key of [script:n]
2018-02-19 15:47:39 +01:00
John Lyu
e467c01afe
Remove heading_key of [script:n] 2018-02-19 22:25:13 +08:00
kira0204
a519afb9c9 Fixing getter 2018-02-19 11:10:19 +05:30
Fenil Gandhi
6bf250aa3e Fixed a bug with bytes encoding error 2018-02-19 09:40:12 +05:30
Miroslav
e2b7abb898 Fix a bug with two-words contentview modes 2018-02-19 00:14:42 +02:00
Maximilian Hils
93425d4b1a
Merge pull request #2757 from mhils/issue-2720
Add alternative keybindings for changing the layout pane on WSL (#2720)
2018-02-16 23:22:56 +01:00
Maximilian Hils
11c739fe18 add ctrl + right as an alias, fix #2720 2018-02-16 22:22:39 +01:00
kira0204
60cd8cb0b1 Adding test 2018-02-16 22:30:29 +05:30
Maximilian Hils
04c3079aa2
Merge pull request #2870 from mhils/transparent-ipv6
Linux: support IPv6 destinations in transparent mode
2018-02-16 16:21:07 +01:00
Maximilian Hils
9e86764ce3 linux: support IPv6 destinations in transparent mode
This fixes #2869 with the help of @aniketpanjwani.
2018-02-16 15:36:21 +01:00
kira0204
e82641ee2d fix 2794 2018-02-15 08:40:54 +05:30
Maximilian Hils
baf4b5dc03
Merge pull request #2841 from aniketpanjwani/fix_linux_transparent_proxy_docs
Modify Linux transparent proxy docs to include ipv6 configuration.
2018-02-13 20:21:40 +01:00
Maximilian Hils
b689f48f7f
Merge pull request #2858 from kajojify/revert_flow
Fix reverting of a flow
2018-02-13 20:08:35 +01:00
Maximilian Hils
58a54febf3
docs: don't set accept_redirects.
it's not really clear why we are even doing this, 
so let's just remove it entirely and see what happens.

Discussion: https://github.com/mitmproxy/mitmproxy/pull/2841#discussion_r165928492
2018-02-13 20:05:58 +01:00
Maximilian Hils
9751f0695d
Merge pull request #2863 from mitmproxy/requires-io-master
[requires.io] dependency update on master branch
2018-02-13 19:57:55 +01:00
Miroslav
f21979f6ad backup for flow.decode/encode 2018-02-12 20:39:53 +02:00
Maximilian Hils
26cb6b7936
Merge pull request #2847 from kira0204/key-cookie-issue
Handling empty key with value for cookies, fix #2827
2018-02-12 11:22:09 +01:00
requires.io
b95319cb66 [requires.io] dependency update 2018-02-12 10:33:06 +01:00
Thomas Kriechbaumer
b68013927d
Merge pull request #2860 from emedvedev/patch-1
Fix a typo in events.rst
2018-02-11 14:35:54 +01:00
Edward Medvedev
5eb2d8a813
Fix a typo in events.rst
This PR fixes a tiny typo in the documentation.
2018-02-11 14:20:53 +01:00
kira0204
06f689aa34 keeping consistency, better testing 2018-02-11 17:25:44 +05:30
Miroslav
8eec21d553 Fix reverting of a flow 2018-02-10 20:29:38 +02:00
Maximilian Hils
aa41ff78c2
Merge pull request #2803 from kajojify/issue-2777
Persist flowfilter when editing it, fix #2777
2018-02-10 12:41:51 +01:00
Maximilian Hils
cda7c8d754
Merge pull request #2851 from mhils/always-use-tls-settings
Use TLS options also for request replay
2018-02-10 12:40:39 +01:00
Thomas Kriechbaumer
dc6552b79b
Merge pull request #2855 from gokulchandra/patch-1
Fixes issue with the pfctl config on OSX
2018-02-09 16:21:27 +01:00
Gokul
2042b32f92
Updates the pfctl config
The previous config threw a syntax error when saving.
2018-02-09 10:42:41 +05:30
Miroslav
e64947d3bc Docs 2018-02-08 21:14:10 +02:00
Miroslav
9f78c36ec4 New command 2018-02-08 20:11:14 +02:00
Maximilian Hils
e4f70b7957 use TLS options also for request replay, refs #2840 2018-02-08 13:17:33 +01:00
Maximilian Hils
a71d050fbf
Merge pull request #2852 from kajojify/excess_return
Excess return was deleted
2018-02-08 12:42:27 +01:00
Miroslav
bd375c2669 Excess return was deleted 2018-02-08 00:31:57 +02:00
Maximilian Hils
326bb546da
Merge pull request #2842 from mitmproxy/web-timings
[web] fix timing display for keepalive connections
2018-02-07 14:18:17 +01:00
Thomas Kriechbaumer
02d8ed8aeb
[requires.io] dependency update on master branch (#2848) 2018-02-07 13:06:29 +01:00
kira0204
4e9d4b37b3 fixing logic 2018-02-07 04:41:12 +05:30
Maximilian Hils
de5dd19297
[web] fix timing display for keepalive connections
see https://discourse.mitmproxy.org/t/mitmweb-details-tab-timing/848/3
2018-02-05 13:52:52 +01:00
Maximilian Hils
05ae3460c0
Merge pull request #2835 from MatthewShao/mitmweb-sort
[web] Fix unstable sorting
2018-02-05 08:21:27 +01:00
Matthew Shao
90d06dcf6f [web] Fix unstable sorting by using 'stable' dependency 2018-02-05 08:28:02 +08:00