Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | specified cipher_list in a few more locations, added a missing comma | Jim Shaver | 2015-03-01 | 2 | -3/+5 |
| | |||||
* | Update Server.py to improve cipher selection | elitest | 2015-02-28 | 1 | -1/+2 |
| | | | Differentiated client ciphers and added server ciphers. | ||||
* | Update Config.py to improve cipher selection | elitest | 2015-02-28 | 1 | -5/+11 |
| | | | added support for specifying cipher suites on both sides of the proxy instead of just the one. | ||||
* | fix #319 | Maximilian Hils | 2015-02-27 | 2 | -10/+14 |
| | |||||
* | Merge remote-tracking branch 'sakurai/feature/issue319' | Maximilian Hils | 2015-02-27 | 1 | -1/+6 |
|\ | |||||
| * | Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319 | Youhei Sakurai | 2015-02-27 | 1 | -1/+1 |
| | | |||||
| * | Change from checking __call__ to using callable; | Youhei Sakurai | 2015-02-27 | 1 | -1/+1 |
| | | | | | | https://github.com/mitmproxy/mitmproxy/issues/319 | ||||
| * | Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319 | Youhei Sakurai | 2015-02-27 | 1 | -1/+6 |
| | | |||||
* | | always include SNI as SAN entry | Maximilian Hils | 2015-02-27 | 1 | -3/+4 |
| | | | | | | | | | | | | To be as robust as possible, we include the SNI value always as a Subject Alternative Name. Second, we make sure that the server address is in the list as well. | ||||
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-02-27 | 5 | -45/+233 |
|\| | |||||
| * | added sni and ssl_established=true in ServerConnection. removed check for ↵ | Marcelo Glezer | 2015-02-12 | 2 | -5/+4 |
| | | | | | | | | None value of server_conn in http.py | ||||
| * | less is more | Marcelo Glezer | 2015-02-12 | 1 | -3/+1 |
| | | |||||
| * | added ClientConnection and ServerConnection to new request | Marcelo Glezer | 2015-02-12 | 1 | -3/+14 |
| | | |||||
| * | removed useless try except | Marcelo Glezer | 2015-02-12 | 1 | -5/+6 |
| | | |||||
| * | fixed typos | Marcelo Glezer | 2015-02-12 | 1 | -2/+2 |
| | | |||||
| * | missing str in http.parse_url | Marcelo Glezer | 2015-02-11 | 1 | -1/+1 |
| | | |||||
| * | renamed add_request to create_request and added a tiny docstring | Marcelo Glezer | 2015-02-11 | 2 | -2/+8 |
| | | |||||
| * | set sni to None when no server_conn is None | Marcelo Glezer | 2015-02-10 | 1 | -2/+4 |
| | | |||||
| * | request is absolute | Marcelo Glezer | 2015-02-10 | 1 | -1/+1 |
| | | |||||
| * | added support for creating new requests. still wip (not working for https) | Marcelo Glezer | 2015-02-10 | 4 | -12/+51 |
| | | |||||
| * | Merge pull request #467 from mitmproxy/clipboard | Maximilian Hils | 2015-02-08 | 3 | -31/+163 |
| |\ | | | | | | | Clipboard | ||||
| | * | remove leftovers | Maximilian Hils | 2015-02-07 | 2 | -1/+1 |
| | | | |||||
| | * | make copy context-sensitive | Maximilian Hils | 2015-02-07 | 3 | -90/+89 |
| | | | |||||
| | * | improve clipboard UX | Maximilian Hils | 2015-02-06 | 3 | -91/+86 |
| | | | |||||
| | * | Merge remote-tracking branch 'tekii/feature-334' | Maximilian Hils | 2015-02-06 | 4 | -29/+167 |
| | |\ | |||||
| | | * | removed str() cast and changed 'failed copy trying save instead' message | Marcelo Glezer | 2015-02-06 | 1 | -2/+2 |
| | | | | |||||
| | | * | save_flow now uses with, and pyperclip requirement updated to 1.5.8 | Marcelo Glezer | 2015-02-06 | 1 | -3/+2 |
| | | | | |||||
| | | * | added copy to clipboard support for url | Marcelo Glezer | 2015-02-05 | 3 | -2/+9 |
| | | | | |||||
| | | * | added support for 'b' key in flowlist | Marcelo Glezer | 2015-02-05 | 2 | -0/+41 |
| | | | | |||||
| | | * | added support for copying request (content|header) to clipboard | Marcelo Glezer | 2015-02-05 | 3 | -9/+34 |
| | | | | |||||
| | | * | used save_body from common when b key is pressed | Marcelo Glezer | 2015-02-05 | 2 | -31/+18 |
| | | | | |||||
| | | * | added support for saving file if content is binary. still wip | Marcelo Glezer | 2015-02-05 | 3 | -6/+44 |
| | | | | |||||
| | | * | extracted server_copy_response to common | Marcelo Glezer | 2015-02-05 | 3 | -40/+26 |
| | | | | |||||
| | | * | removed pyperclip hard dependencies | Marcelo Glezer | 2015-02-05 | 2 | -22/+34 |
| | | | | |||||
| | | * | used get_decoded_content and removed decode call from headers as max suggested | Marcelo Glezer | 2015-02-05 | 3 | -14/+4 |
| | | | | |||||
| | | * | added copy functionality to flowview too | Marcelo Glezer | 2015-02-05 | 1 | -1/+23 |
| | | | | |||||
| | | * | removed invalid comment and unneeded safe text | Marcelo Glezer | 2015-02-05 | 2 | -5/+0 |
| | | | | |||||
| | | * | now content and header are working and exception for binary files are ↵ | Marcelo Glezer | 2015-02-05 | 2 | -11/+16 |
| | | | | | | | | | | | | | | | | handled correctly | ||||
| | | * | wip - content copy is working, header representation is not | Marcelo Glezer | 2015-02-05 | 2 | -0/+31 |
| | | | | |||||
* | | | | fix #479 | Maximilian Hils | 2015-02-27 | 1 | -1/+6 |
|/ / / | |||||
* | | | disable replay from ui for live flows | Maximilian Hils | 2015-02-07 | 1 | -0/+2 |
| | | | |||||
* | | | fix #110 | Maximilian Hils | 2015-02-07 | 1 | -0/+6 |
| | | | |||||
* | | | fix #451 | Maximilian Hils | 2015-02-07 | 3 | -19/+35 |
| | | | |||||
* | | | fix tests, re-enable pypy, do housekeeping | Maximilian Hils | 2015-02-07 | 1 | -4/+4 |
|/ / | |||||
* | | fix #459 | Maximilian Hils | 2015-02-05 | 2 | -6/+10 |
| | | |||||
* | | fix ssl shutdown in tcp mode, refs #464 | Maximilian Hils | 2015-02-05 | 1 | -1/+3 |
|/ | |||||
* | fix #464 | Maximilian Hils | 2015-02-05 | 2 | -5/+7 |
| | |||||
* | clean up flow reading | Maximilian Hils | 2015-02-05 | 3 | -33/+46 |
| | |||||
* | Merge remote-tracking branch 'tekii/master' | Maximilian Hils | 2015-02-05 | 3 | -10/+14 |
|\ | |||||
| * | open flow files using with as max suggested | Marcelo Glezer | 2015-01-12 | 2 | -4/+4 |
| | |