Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Remove dependency on PyOpenSSL, move version check into netlib. | Aldo Cortesi | 2015-05-31 | 1 | -44/+4 | |
| |/ |/| | | | | | | | There are a few more functions in the code that accesses PyOpenSSL directly that should probably also be moved to netlib. Later. | |||||
* | | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 40 | -404/+732 | |
| | | ||||||
* | | Ensure that flow/view state is consistent. | Aldo Cortesi | 2015-05-29 | 1 | -2/+3 | |
| | | | | | | | | Fixes #595 and #592 | |||||
* | | Post-release version bump, and checklist addition. | Aldo Cortesi | 2015-05-26 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #584 from dlethin/feature/http_1_0 | Aldo Cortesi | 2015-05-18 | 1 | -1/+2 | |
|\ \ | | | | | | | Make sure proxy returns the httpversion specified in the request | |||||
| * | | Make sure proxy returns the httpversion specified in the request rather | Doug Lethin | 2015-05-15 | 1 | -1/+2 | |
| | | | | | | | | | | | | than hardcoding to 1.1. | |||||
* | | | Release pep: bump version, changelog, contributors | Aldo Cortesi | 2015-05-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Accurately timestamp start of request | Nick Raptis | 2015-05-08 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a request from a stream, try to get an accurate start timestamp from the Reader. This was already in the code and also used when building response objects, but was ommited in commit ddf458b330bf9fe200cb1dbc3ddb5ae1a5d2102a Without his logic and when the client is reusing a connection to send requests, the timestamp_start of subsequent requests is early and equal to when the connection started read blocking | |||||
* | | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-05-02 | 3 | -1423/+1718 | |
|\ \ \ | ||||||
| * | | | web: try harder to fix editor | Maximilian Hils | 2015-05-01 | 1 | -2/+7 | |
| | | | | ||||||
| * | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-05-01 | 6 | -21/+11 | |
| |\| | | ||||||
| * | | | mitmweb: add editor | Maximilian Hils | 2015-05-01 | 3 | -1423/+1713 | |
| | | | | ||||||
* | | | | Adapt to new Pathoc API - silence output to stdout. | Aldo Cortesi | 2015-05-02 | 1 | -2/+1 | |
| |/ / |/| | | ||||||
* | | | pretty_size now lives in netlib.utils | Aldo Cortesi | 2015-04-30 | 6 | -21/+11 | |
|/ / | ||||||
* | | Merge pull request #569 from mike-pt/master | Maximilian Hils | 2015-04-27 | 2 | -4/+4 | |
|\ \ | | | | | | | Match all freebsd versions and not just freebsd10 | |||||
| * | | + Use sys.platform.startswith("freebsd") instead of matching just freebsd10. | Mike C | 2015-04-27 | 2 | -4/+4 | |
| | | | | | | | | | | | | + This means support for any freebsd version (note that I only tested 11-CURRENT and 9) | |||||
* | | | make code more pythonic | Maximilian Hils | 2015-04-26 | 1 | -8/+11 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'tunz/crash1' | Maximilian Hils | 2015-04-26 | 1 | -4/+11 | |
|\ \ \ | ||||||
| * | | | Fix crash when save to clipboard before loading | Choongwoo Han | 2015-04-23 | 1 | -4/+11 | |
| | | | | ||||||
* | | | | remove superfluous set_focus | Maximilian Hils | 2015-04-26 | 1 | -2/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-04-26 | 2 | -110/+85 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Check overwrite, when save to file instaed of clipboard | Choongwoo Han | 2015-04-23 | 1 | -2/+20 | |
| |/ / | ||||||
| * | | Missed some un-needed variable declarations | Aldo Cortesi | 2015-04-21 | 1 | -3/+1 | |
| | | | ||||||
| * | | HTTP request reading moves to netlib | Aldo Cortesi | 2015-04-21 | 1 | -105/+64 | |
| | | | ||||||
* | | | fix #568 | Maximilian Hils | 2015-04-26 | 2 | -2/+3 | |
|/ / | ||||||
* | | console: make g/G shortcuts work in more contexts | Aldo Cortesi | 2015-04-17 | 3 | -2/+15 | |
| | | ||||||
* | | console: more consistent view stack management | Aldo Cortesi | 2015-04-17 | 1 | -40/+55 | |
| | | ||||||
* | | console: suport unary attributes | Aldo Cortesi | 2015-04-17 | 3 | -28/+66 | |
| | | | | | | | | | | | | | | | | | | Attributes with no value are treated as unary, e.g. "Secure" rather than "Secure=". If you really want to have an empty attribute value you can edit the header directly. Behind the scenes, restructure GridEditor to know about data conversion in and out of the editor. | |||||
* | | console: refactor grideditor, fix a crash on tab for subeditors | Aldo Cortesi | 2015-04-16 | 1 | -59/+52 | |
| | | ||||||
* | | Adjust header key color in solarized palettes | Aldo Cortesi | 2015-04-16 | 1 | -2/+2 | |
| | | ||||||
* | | console: first pass of a Set-cookie editor for responses | Aldo Cortesi | 2015-04-16 | 3 | -66/+196 | |
| | | ||||||
* | | console: add a -l flag to set the limit on startup | Aldo Cortesi | 2015-04-15 | 4 | -0/+16 | |
| | | ||||||
* | | Adjust for ODict interface change | Aldo Cortesi | 2015-04-15 | 3 | -4/+4 | |
| | | ||||||
* | | Editor for request cookies | Aldo Cortesi | 2015-04-15 | 2 | -21/+53 | |
| | | ||||||
* | | Add set_cookies method to HTTPResponse | Aldo Cortesi | 2015-04-14 | 1 | -0/+19 | |
| | | ||||||
* | | New get_cookies for HttpResponse | Aldo Cortesi | 2015-04-14 | 1 | -13/+14 | |
| | | ||||||
* | | New get_cookie and set_cookie implementations for HTTPRequest | Aldo Cortesi | 2015-04-14 | 1 | -9/+16 | |
| | | ||||||
* | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-04-14 | 1 | -4/+29 | |
|\ \ | ||||||
| * | | fix pretty_host if no host is present | Maximilian Hils | 2015-04-10 | 1 | -2/+4 | |
| | | | ||||||
| * | | fix #553 | Maximilian Hils | 2015-04-10 | 1 | -2/+25 | |
| | | | ||||||
* | | | Housekeeping and cleanups | Aldo Cortesi | 2015-04-14 | 4 | -22/+21 | |
|/ / | | | | | | | | | | | | | | | - 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 #547 from macmantrl/blank_values | Maximilian Hils | 2015-04-08 | 1 | -1/+1 | |
|\ \ | | | | | | | Keep blank query values for flow hashing | |||||
| * | | Keep blank query values for flow hashing | Terry Long | 2015-04-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-04-08 | 20 | -1746/+1999 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #543 from legendtang/master | Maximilian Hils | 2015-04-08 | 2 | -1450/+1246 | |
| |\ \ \ | | | | | | | | | | | web: fix delete flows | |||||
| | * \ \ | Merge https://github.com/mitmproxy/mitmproxy | Legend Tang | 2015-04-06 | 10 | -119/+363 | |
| | |\ \ \ | ||||||
| | * | | | | web: fix delete flows | Legend Tang | 2015-03-30 | 2 | -1450/+1246 | |
| | | | | | | ||||||
| * | | | | | console: add g/G shortcuts throughout | Aldo Cortesi | 2015-04-07 | 4 | -7/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | g: go to end G: go to beginning | |||||
| * | | | | | Refactor flow list state management | Aldo Cortesi | 2015-04-07 | 7 | -48/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use signal mechanism for state synchronisation - Move "Copy to clipboard" shortcut to "P" | |||||
| * | | | | | consone: don't enter Options if it's already open | Aldo Cortesi | 2015-04-07 | 1 | -0/+3 | |
| | | | | | |