aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix #319Maximilian Hils2015-02-276-22/+43
* Merge remote-tracking branch 'sakurai/feature/issue319'Maximilian Hils2015-02-273-1/+28
|\
| * Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-271-1/+1
| * Change from checking __call__ to using callable;Youhei Sakurai2015-02-272-2/+2
| * Modify example to notify incompatibility with --stream SIZE command lineYouhei Sakurai2015-02-271-0/+8
| * Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-273-1/+20
* | add example inline script for dns spoofing, refs #486Maximilian Hils2015-02-272-0/+36
* | always include SNI as SAN entryMaximilian Hils2015-02-271-3/+4
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-02-276-46/+235
|\|
| * Merge pull request #474 from tekii/feature-426Maximilian Hils2015-02-135-14/+70
| |\
| | * added sni and ssl_established=true in ServerConnection. removed check for Non...Marcelo Glezer2015-02-122-5/+4
| | * less is moreMarcelo Glezer2015-02-121-3/+1
| | * added ClientConnection and ServerConnection to new requestMarcelo Glezer2015-02-121-3/+14
| | * removed useless try exceptMarcelo Glezer2015-02-121-5/+6
| | * fixed typosMarcelo Glezer2015-02-121-2/+2
| | * missing str in http.parse_urlMarcelo Glezer2015-02-111-1/+1
| | * renamed add_request to create_request and added a tiny docstringMarcelo Glezer2015-02-112-2/+8
| | * set sni to None when no server_conn is NoneMarcelo Glezer2015-02-101-2/+4
| | * request is absoluteMarcelo Glezer2015-02-101-1/+1
| | * added support for creating new requests. still wip (not working for https)Marcelo Glezer2015-02-104-12/+51
| |/
| * Merge pull request #467 from mitmproxy/clipboardMaximilian Hils2015-02-084-32/+165
| |\
| | * remove leftoversMaximilian Hils2015-02-072-1/+1
| | * make copy context-sensitiveMaximilian Hils2015-02-073-90/+89
| | * improve clipboard UXMaximilian Hils2015-02-063-91/+86
| | * Merge remote-tracking branch 'tekii/feature-334'Maximilian Hils2015-02-065-30/+169
| | |\
| | | * removed str() cast and changed 'failed copy trying save instead' messageMarcelo Glezer2015-02-061-2/+2
| | | * save_flow now uses with, and pyperclip requirement updated to 1.5.8Marcelo Glezer2015-02-062-4/+3
| | | * Merge branch 'feature-334' of github.com:tekii/mitmproxy into feature-334Marcelo Glezer2015-02-050-0/+0
| | | |\
| | | | * Merge remote-tracking branch 'base/master' into feature-334Marcelo Glezer2015-02-052-2/+6
| | | | |\
| | | | * | added copy to clipboard support for urlMarcelo Glezer2015-02-033-2/+9
| | | | * | added support for 'b' key in flowlistMarcelo Glezer2015-01-162-0/+41
| | | | * | added support for copying request (content|header) to clipboardMarcelo Glezer2015-01-163-9/+34
| | | | * | used save_body from common when b key is pressedMarcelo Glezer2015-01-152-31/+18
| | | | * | added support for saving file if content is binary. still wipMarcelo Glezer2015-01-153-6/+44
| | | | * | extracted server_copy_response to commonMarcelo Glezer2015-01-153-40/+26
| | | | * | removed pyperclip hard dependenciesMarcelo Glezer2015-01-153-25/+35
| | | | * | trying to fix travis take 2Marcelo Glezer2015-01-141-1/+1
| | | | * | trying to fix travisMarcelo Glezer2015-01-141-0/+2
| | | | * | used get_decoded_content and removed decode call from headers as max suggestedMarcelo Glezer2015-01-143-14/+4
| | | | * | added copy functionality to flowview tooMarcelo Glezer2015-01-141-1/+23
| | | | * | removed invalid comment and unneeded safe textMarcelo Glezer2015-01-142-5/+0
| | | | * | now content and header are working and exception for binary files are handled...Marcelo Glezer2015-01-142-11/+16
| | | | * | wip - content copy is working, header representation is notMarcelo Glezer2015-01-142-0/+31
| | | | * | added pyperclip dependencyMarcelo Glezer2015-01-131-1/+2
| | | * | | added copy to clipboard support for urlMarcelo Glezer2015-02-053-2/+9
| | | * | | added support for 'b' key in flowlistMarcelo Glezer2015-02-052-0/+41
| | | * | | added support for copying request (content|header) to clipboardMarcelo Glezer2015-02-053-9/+34
| | | * | | used save_body from common when b key is pressedMarcelo Glezer2015-02-052-31/+18
| | | * | | added support for saving file if content is binary. still wipMarcelo Glezer2015-02-053-6/+44
| | | * | | extracted server_copy_response to commonMarcelo Glezer2015-02-053-40/+26