Commit Graph

7841 Commits

Author SHA1 Message Date
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
Aniket Panjwani
bb3e7ee86c Modify Linux transparent proxy docs to include ipv6 configuration. 2018-02-04 10:42:03 -06:00
Arushit Mudgal
91834f98cc Extend mypy checking, fix #2194 (#2819) 2018-02-03 21:37:33 +01:00
Samoilenko Roman
7733252627 don't raise when pyperclip doesn't find a clipboard, fix #2816 2018-02-03 13:53:09 +01:00
Samoilenko Roman
957a630bb5 add shortcuts for console.choose, fix #2785 2018-02-03 03:22:03 +01:00
Maximilian Hils
6d8731e144
Merge pull request #2833 from mitmproxy/issue-2824
Improve error message for missing scripts, fix #2824
2018-02-01 10:17:38 +01:00
Maximilian Hils
4decb5c2e3 remove quotes around filename 2018-02-01 09:57:25 +01:00
Maximilian Hils
b57f1a86af
improve error message for missing scripts, fix #2824 2018-02-01 09:31:20 +01:00
Maximilian Hils
02d2ef7506
Merge pull request #2814 from kajojify/issue-2753
Fix #2753. Fix resetting editings.
2018-01-30 21:19:40 +01:00
Maximilian Hils
e117c9e337
Merge pull request #2825 from kajojify/realtime_counter
Real-time flow counter
2018-01-30 19:22:52 +01:00
Miroslav
48cc7c2f70 Real-time flow counter 2018-01-30 14:10:05 +02:00
Maximilian Hils
f028fb6a01
Merge pull request #2820 from aniketpanjwani/master
Fix mistakes in examples/simple/Readme.md.
2018-01-29 19:11:36 +01:00
Aniket Panjwani
71494c6a06 Fix mistakes in examples/simple/Readme.md.
1. Delete row for script_arguments.py.
2. Add row for custom_option.py, using script_arguments.py's Description.
2018-01-29 12:06:38 -06:00
Maximilian Hils
212e3b2f52
Merge pull request #2817 from Kriechi/bump-bugfix-dependencies
bump minimum requirements for known bugfix releases
2018-01-29 16:41:17 +01:00
Thomas Kriechbaumer
7610d78bb6 bump minimum requirements for known bugfix releases 2018-01-27 11:27:37 +01:00
Maximilian Hils
bfac5f968e
bump minimum required urwid version, fix #2815 2018-01-26 20:28:11 +01:00
Miroslav
4bb22bbe8a Fix #2753. Fix resetting editings. 2018-01-26 18:37:35 +02:00
Samoilenko Roman
4b93e16e78 Fix for #2750 and #2783 (#2809) 2018-01-25 16:07:09 +01:00
Arushit Mudgal
f41d521ce5 fix #2800 2018-01-25 16:06:19 +01:00
Miroslav
0cb38f6329 Fix #2777 2018-01-19 02:07:01 +02:00
Samoilenko Roman
6dd336fcec Fix #2786 (#2798) 2018-01-18 19:31:27 +01:00
Samoilenko Roman
66c50ae7a5 fix #2752 (#2796) 2018-01-18 19:27:26 +01:00
Thomas Kriechbaumer
06da673942 [requires.io] dependency update on master branch (#2799) 2018-01-18 19:25:59 +01:00
Maximilian Hils
8dfb8a9a74
Merge pull request #2736 from mitmproxy/posix-commands
Parse Commands in POSIX mode
2018-01-18 00:50:27 +01:00
Maximilian Hils
6e7030fcfb
update stale URL in README 2018-01-15 18:53:57 +01:00
Samoilenko Roman
2d07678fe5 Fix #2765 (#2792) 2018-01-14 21:54:43 +01:00
Samoilenko Roman
6b22da6a34 Fix #2768 (#2778) 2018-01-14 21:54:09 +01:00
Maximilian Hils
9a43ff5da1
Merge pull request #2793 from kajojify/issue-2399
Issue 2399
2018-01-14 21:52:32 +01:00
Miroslav
2fd9ef4769 Other condition 2018-01-14 13:46:06 +02:00
Miroslav
267b1af835 Fix #2399 2018-01-14 13:41:15 +02:00
Maximilian Hils
3b5237c55f
Merge pull request #2791 from mhils/tls-extensions
Store ClientHello extensions with client connection
2018-01-13 14:09:53 +01:00
Maximilian Hils
d9e3fcf5ef store ClientHello extensions with client connection 2018-01-13 01:49:20 +01:00
Maximilian Hils
96a5ed9dff
Merge pull request #2790 from mhils/stateobject-improvements
stateobject: use typing, enable tuples and more complex datatypes
2018-01-13 00:35:49 +01:00