Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #1687 from Kriechi/http2-type-information | Aldo Cortesi | 2016-10-29 | 3 | -28/+29 | |
|\ | | | | | http2: add more type information | |||||
| * | http2: add more type information | Thomas Kriechbaumer | 2016-10-27 | 3 | -28/+29 | |
| | | ||||||
* | | Merge pull request #1686 from Kriechi/http2-push-indicator | Aldo Cortesi | 2016-10-29 | 7 | -100/+120 | |
|\ \ | |/ |/| | http2: add an indicator for pushed streams | |||||
| * | http2: add push indicator | Thomas Kriechbaumer | 2016-10-27 | 7 | -100/+120 | |
|/ | ||||||
* | Merge pull request #1685 from mhils/travis | Maximilian Hils | 2016-10-27 | 1 | -0/+2 | |
|\ | | | | | fix travis | |||||
| * | fix travis | Maximilian Hils | 2016-10-27 | 1 | -0/+2 | |
| | | ||||||
* | | Merge pull request #1684 from mhils/1675 | Maximilian Hils | 2016-10-27 | 1 | -1/+5 | |
|\ \ | | | | | | | Fix #1675 | |||||
| * | | fix #1675 | Maximilian Hils | 2016-10-27 | 1 | -1/+5 | |
| | | | ||||||
* | | | Merge pull request #1671 from mitmproxy/bump-h2 | Maximilian Hils | 2016-10-27 | 3 | -18/+26 | |
|\ \ \ | | | | | | | | | Bump h2 version | |||||
| * | | | upgrade h2 to >=2.5.0 | Thomas Kriechbaumer | 2016-10-27 | 3 | -18/+26 | |
| | | | | ||||||
| * | | | bump h2 version | Maximilian Hils | 2016-10-27 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #1681 from mhils/issue-1676 | Maximilian Hils | 2016-10-27 | 1 | -1/+1 | |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | Fix #1676 | |||||
| * | | fix #1676 | Maximilian Hils | 2016-10-27 | 1 | -1/+1 | |
|/ / | ||||||
* / | fix #1678 | Maximilian Hils | 2016-10-27 | 1 | -3/+4 | |
|/ | ||||||
* | Merge pull request #1680 from mhils/remove-lrucache | Maximilian Hils | 2016-10-27 | 1 | -32/+0 | |
|\ | | | | | Remove mitmproxy.utils.lrucache | |||||
| * | remove mitmproxy.utils.lrucache | Maximilian Hils | 2016-10-27 | 1 | -32/+0 | |
| | | ||||||
* | | fix pyinstaller builds | Maximilian Hils | 2016-10-27 | 3 | -3/+3 | |
| | | ||||||
* | | Merge pull request #1670 from chhsiao90/display-cipher-#582 | Maximilian Hils | 2016-10-27 | 4 | -1/+19 | |
|\ \ | |/ |/| | Resolved #582: display ClientConnection select cipher of TLS | |||||
| * | Show tls version on console | chhsiao90 | 2016-10-26 | 4 | -0/+9 | |
| | | ||||||
| * | Resolved #582: display ClientConnection select cipher of TLS | chhsiao90 | 2016-10-26 | 4 | -1/+10 | |
| | | ||||||
* | | Merge pull request #1677 from cortesi/mypy | Aldo Cortesi | 2016-10-27 | 2 | -4/+5 | |
|\ \ | | | | | | | Add mypy to lint | |||||
| * | | Add mypy to lint | Aldo Cortesi | 2016-10-27 | 2 | -4/+5 | |
|/ / | | | | | | | | | | | | | An extremely modest beginning, but we'll roll this out over the whole codebase in time. Also move flake8 and mypy dependencies into setup[dev]. | |||||
* | | Merge pull request #1673 from mhils/issue-1620 | Aldo Cortesi | 2016-10-27 | 4 | -9/+14 | |
|\ \ | | | | | | | fix #1620 | |||||
| * | | fix the linter, knuth ftw! | Maximilian Hils | 2016-10-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | fix #1620 | Maximilian Hils | 2016-10-25 | 3 | -8/+13 | |
| | | | ||||||
* | | | fix pyinstaller builds | Maximilian Hils | 2016-10-26 | 2 | -2/+2 | |
| | | | ||||||
* | | | Update and rename README.mkd to README.md | Maximilian Hils | 2016-10-25 | 2 | -20/+8 | |
| | | | ||||||
* | | | minor fixes | Maximilian Hils | 2016-10-25 | 2 | -4/+4 | |
|/ / | ||||||
* | | Merge pull request #1669 from mhils/typecheck-options | Maximilian Hils | 2016-10-25 | 16 | -20/+138 | |
|\ \ | |/ |/| | Typecheck options | |||||
| * | typecheck options, fix current inconsistencies | Maximilian Hils | 2016-10-25 | 16 | -21/+135 | |
| | | ||||||
| * | make options keyword-only | Maximilian Hils | 2016-10-25 | 4 | -0/+4 | |
|/ | ||||||
* | Merge pull request #1664 from chhsiao90/sni-display-#1639 | Maximilian Hils | 2016-10-24 | 4 | -1/+10 | |
|\ | | | | | Resolved #1639: display sni on ClientConnection | |||||
| * | Resolved #1639: display sni on ClientConnection | chhsiao90 | 2016-10-25 | 4 | -1/+10 | |
| | | ||||||
* | | Merge pull request #1656 from mhils/improve-export-2 | Maximilian Hils | 2016-10-24 | 7 | -162/+87 | |
|\ \ | | | | | | | Improve Flow Export | |||||
| * | | improve flow export | Maximilian Hils | 2016-10-22 | 7 | -162/+87 | |
| | | | ||||||
* | | | Merge pull request #1661 from slobo/patch-1 | Maximilian Hils | 2016-10-24 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Include `boudary=...` in mutipart postData | |||||
| * | | Include `boudary=...` in mutipart postData | Slobodan Mišković | 2016-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the HAR spec is not very explicit and their example shows just this one example: ```json "postData": { "mimeType": "multipart/form-data" } ``` Would it not make sense to include all the information necessary to parse out the post data `text`. Eg. ```json "postData": { "text": "--xYzZY\r\nContent-Disposition: form-data; name=\"sort1\"\r\n\r\noldest date first\r\n--xYzZY--\r\n", "mimeType": "multipart/form-data; boundary=xYzZY" }, ``` Currently, full mimeType is included only in `content-type` request header. Elsewhere in HAR spec they include the 'extras', eg ```json "content": { "mimeType": "text/html; charset=utf-8" } ``` So one could argue that `mimeType` should include all information necessary to interpret the data. In case of `multipart/form-data`, as per RFC2046 http://www.ietf.org/rfc/rfc2046.txt ``` The Content-Type field for multipart entities requires one parameter, "boundary". ``` I believe that earlier incarnations, eg `har_exporter.py` included it in the mimeType. | |||||
* | | | fix FlowView._get_content_view | Maximilian Hils | 2016-10-24 | 1 | -2/+6 | |
| | | | ||||||
* | | | replace mitmproxy.utils.lrucache with functools.lru_cache | Sahil Chelaramani | 2016-10-24 | 3 | -49/+6 | |
| | | | ||||||
* | | | disable erroneous linting errors | Maximilian Hils | 2016-10-24 | 1 | -8/+9 | |
| | | | ||||||
* | | | add version check for Python 3.4- | Maximilian Hils | 2016-10-24 | 1 | -0/+6 | |
|/ / | ||||||
* | | Merge pull request #1649 from cortesi/kill | Maximilian Hils | 2016-10-22 | 3 | -3/+1 | |
|\ \ | |/ |/| | Don't call error for flow kill | |||||
| * | Don't call error for flow kill | Aldo Cortesi | 2016-10-22 | 3 | -3/+1 | |
| | | | | | | | | | | This is now the error handler on master, so whatever the intetion was it's now definitely wrong. | |||||
* | | Merge pull request #1655 from mhils/fix-encoding | Maximilian Hils | 2016-10-22 | 5 | -16/+40 | |
|\ \ | | | | | | | Encoding Fixes | |||||
| * | | various encoding fixes, fix #1650 | Maximilian Hils | 2016-10-22 | 5 | -25/+41 | |
| | | | ||||||
| * | | Handle `bytes` in request parameters | Slobodan Mišković | 2016-10-22 | 1 | -2/+10 | |
| |/ | ||||||
* | | Merge pull request #1653 from mhils/issue-1651 | Maximilian Hils | 2016-10-22 | 2 | -5/+8 | |
|\ \ | |/ |/| | Fix README Syntax (#1651) | |||||
| * | add README.rst validation to CI | Maximilian Hils | 2016-10-22 | 1 | -2/+6 | |
| | | ||||||
| * | fix README syntax | Maximilian Hils | 2016-10-22 | 1 | -3/+2 | |
|/ | ||||||
* | Merge pull request #1648 from cortesi/console | Aldo Cortesi | 2016-10-22 | 1 | -1/+1 | |
|\ | | | | | console: give statusbar messages a default timeout |