Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | minor stylistic fixes | Maximilian Hils | 2015-11-14 | 1 | -11/+13 |
| | |||||
* | Feedback from PR #832 | Chris Czub | 2015-11-13 | 1 | -0/+66 |
| | |||||
* | adjust to netlib request changes + docs | Maximilian Hils | 2015-09-26 | 2 | -6/+5 |
| | |||||
* | code -> status_code, httpversion -> http_version | Maximilian Hils | 2015-09-17 | 1 | -4/+3 |
| | |||||
* | use new netlib exceptions | Maximilian Hils | 2015-09-17 | 1 | -2/+2 |
| | |||||
* | adjust to netlib changes | Maximilian Hils | 2015-09-16 | 1 | -1/+1 |
| | |||||
* | add inline script for conditional tls passthrough | Maximilian Hils | 2015-09-08 | 2 | -0/+140 |
| | | | | fix #646 | ||||
* | adjust to new netlib Headers class | Maximilian Hils | 2015-09-05 | 6 | -17/+16 |
| | |||||
* | update example inline scripts | Maximilian Hils | 2015-09-04 | 9 | -26/+19 |
| | |||||
* | remove depth attribute from set_server | Maximilian Hils | 2015-09-03 | 1 | -11/+1 |
| | |||||
* | update inline script hooks | Maximilian Hils | 2015-08-31 | 1 | -3/+10 |
| | |||||
* | fix dns_spoofing example, avoid connecting to itself | Maximilian Hils | 2015-08-31 | 1 | -17/+30 |
| | |||||
* | fix upstream proxy server change, update example | Maximilian Hils | 2015-08-31 | 1 | -21/+26 |
| | |||||
* | remove old code | Maximilian Hils | 2015-08-30 | 1 | -37/+0 |
| | |||||
* | Fixing issue #710. Prety printing in read_dumpfile | FreeArtMan | 2015-08-19 | 1 | -1/+3 |
| | |||||
* | Small tweaks to read_dumpfile example. | Aldo Cortesi | 2015-08-17 | 1 | -1/+1 |
| | |||||
* | move code to netlib | Thomas Kriechbaumer | 2015-08-10 | 1 | -5/+6 |
| | |||||
* | attach application protocol to connection | Thomas Kriechbaumer | 2015-07-30 | 1 | -1/+1 |
| | |||||
* | move code to netlib and implement protocols | Thomas Kriechbaumer | 2015-07-30 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into print-bracket-fix | Jim Shaver | 2015-05-31 | 22 | -78/+194 |
|\ | | | | | | | | | | | | | | | Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py | ||||
| * | 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 |
| |/ | | | | | | | | | | | | | | | - No output to stdout on load in examples - they muck up the test suite. - Use the odict module directly, rather than aliasing it. The small convenience this gives to scripters is not worth it. - Move the cookie tests from the flow test module to the protocol_http test module. | ||||
| * | 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 | ||||
| | * | 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 |
| | | | | | | option; https://github.com/mitmproxy/mitmproxy/issues/319 | ||||
| * | 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 spacing, line length, unused imports, unusual import idioms - Prevent it from barfing into our test output | ||||
* | 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 ↵ | Justus Wingert | 2014-11-15 | 1 | -14/+22 |
| | | | | examples section in requirements.txt. Updated har_extractor to use command line arguments. | ||||
* | Switched to pytz. Added comment for clarification on behaviour of ↵ | Justus Wingert | 2014-11-15 | 1 | -15/+8 |
| | | | | HAREncodable. Added missing parameter in reset(). Fixed accessing headers. | ||||
* | It seems get_decoded_content can actually be shorter than content due to ↵ | Justus Wingert | 2014-11-15 | 1 | -1/+1 |
| | | | | encoding issues. Since I'm not crazy after all it seems safe to push. | ||||
* | Removed the globals and replaced them with internal attributes of _HARLog. ↵ | Justus Wingert | 2014-11-15 | 1 | -34/+46 |
| | | | | Minor bugfixes to make ssl timings work. | ||||
* | 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 |
| |