| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'upstream/master' into print-bracket-fix | Jim Shaver | 2015-05-31 | 22 | -78/+194 |
|\ |
|
| * | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 22 | -85/+164 |
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-04-14 | 2 | -0/+21 |
| |\ |
|
| | * | spaces, not tabs | Maximilian Hils | 2015-04-12 | 2 | -5/+9 |
| | * | add flowwriter example | Maximilian Hils | 2015-04-12 | 1 | -0/+17 |
| * | | Housekeeping and cleanups | Aldo Cortesi | 2015-04-14 | 1 | -2/+1 |
| |/ |
|
| * | Merge pull request #544 from ryoqun/websocket-connection-header-case-sensitivity | Maximilian Hils | 2015-04-08 | 1 | -1/+2 |
| |\ |
|
| | * | Make the Websocket's connection header value case-insensitive | Ryo Onodera | 2015-03-31 | 1 | -1/+2 |
| * | | add example which uses filt | Maximilian Hils | 2015-04-08 | 2 | -0/+16 |
| |/ |
|
* / | Fixed print function to be inline with python 3 | Jim Shaver | 2015-05-29 | 5 | -9/+9 |
|/ |
|
* | fix #319 | Maximilian Hils | 2015-02-27 | 1 | -8/+11 |
* | Merge remote-tracking branch 'sakurai/feature/issue319' | Maximilian Hils | 2015-02-27 | 1 | -0/+19 |
|\ |
|
| * | Modify example to notify incompatibility with --stream SIZE command line | Youhei Sakurai | 2015-02-27 | 1 | -0/+8 |
| * | Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319 | Youhei Sakurai | 2015-02-27 | 1 | -0/+11 |
* | | add example inline script for dns spoofing, refs #486 | Maximilian Hils | 2015-02-27 | 2 | -0/+36 |
|/ |
|
* | Clean up har_extractor example | Aldo Cortesi | 2015-01-02 | 1 | -54/+76 |
* | fix tests | Maximilian Hils | 2014-12-01 | 1 | -8/+15 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2014-12-01 | 1 | -1/+1 |
|\ |
|
| * | Changed argument name from confdir to cadir in flowbasic example | Gabriel Kirkpatrick | 2014-11-28 | 1 | -1/+1 |
* | | add inline script example for websocket passthrough, fix #340 | Maximilian Hils | 2014-12-01 | 1 | -0/+27 |
|/ |
|
* | Added try/except block for import errors with harparser and pytz. | Justus Wingert | 2014-11-15 | 1 | -2/+8 |
* | Updated setup.py and moved requirements to examples section. Included example... | Justus Wingert | 2014-11-15 | 1 | -14/+22 |
* | Switched to pytz. Added comment for clarification on behaviour of HAREncodabl... | Justus Wingert | 2014-11-15 | 1 | -15/+8 |
* | It seems get_decoded_content can actually be shorter than content due to enco... | Justus Wingert | 2014-11-15 | 1 | -1/+1 |
* | Removed the globals and replaced them with internal attributes of _HARLog. Mi... | Justus Wingert | 2014-11-15 | 1 | -34/+46 |
* | Typo... | Justus Wingert | 2014-11-15 | 1 | -1/+1 |
* | Improved helper method, marginally. | Justus Wingert | 2014-11-15 | 1 | -4/+4 |
* | Updated documentation and cleaned up the code. | Justus Wingert | 2014-11-15 | 1 | -105/+91 |
* | Initial checkin with har_extractor script. | Justus Wingert | 2014-11-15 | 1 | -0/+207 |
* | update change_upstream_proxy example | Maximilian Hils | 2014-11-10 | 1 | -2/+2 |
* | remove default_ca | Maximilian Hils | 2014-10-18 | 2 | -5/+2 |
* | fix support for chained certificates | Maximilian Hils | 2014-10-08 | 2 | -2/+2 |
* | Clean up and clarify StateObject | Aldo Cortesi | 2014-09-17 | 1 | -2/+2 |
* | update iframe injector example to use BeautifulSoup | Maximilian Hils | 2014-09-12 | 1 | -6/+10 |
* | mitmproxy -> libmproxy.main. do some leanup on the way | Maximilian Hils | 2014-09-08 | 2 | -3/+5 |
* | update examples, fix #353 | Maximilian Hils | 2014-09-08 | 18 | -132/+135 |
* | add note that request.host should be used in the majority of cases | Maximilian Hils | 2014-09-07 | 1 | -0/+3 |
* | improve change_server api, add example how to change the upstream server | Maximilian Hils | 2014-09-07 | 1 | -0/+17 |
* | update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93 | Maximilian Hils | 2014-09-05 | 10 | -27/+32 |
* | iframe injector example: use inline script | Maximilian Hils | 2014-09-05 | 2 | -50/+18 |
* | Merge branch 'issue_341' into server_change_api | Maximilian Hils | 2014-09-04 | 1 | -1/+1 |
|\ |
|
| * | fix some leftovers | Maximilian Hils | 2014-09-04 | 1 | -1/+1 |
* | | improve HTTPRequest syntax | Maximilian Hils | 2014-09-03 | 3 | -7/+7 |
|/ |
|
* | fix #341 - work on flows instead of request/response internally. | Maximilian Hils | 2014-09-03 | 2 | -12/+12 |
* | fix #274 | Maximilian Hils | 2014-08-09 | 1 | -2/+2 |
* | docs: add docs for script args, fix #293 | Maximilian Hils | 2014-08-07 | 1 | -4/+3 |
* | improve example scripts | Maximilian Hils | 2014-08-03 | 1 | -3/+2 |
* | Merge branch 'stream' | Maximilian Hils | 2014-07-31 | 2 | -0/+14 |
|\ |
|
| * | add --stream options, various fixes | Maximilian Hils | 2014-07-21 | 2 | -0/+14 |
* | | fix tests | Maximilian Hils | 2014-07-26 | 1 | -2/+1 |