aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #1687 from Kriechi/http2-type-informationAldo Cortesi2016-10-293-28/+29
|\ | | | | http2: add more type information
| * http2: add more type informationThomas Kriechbaumer2016-10-273-28/+29
| |
* | Merge pull request #1686 from Kriechi/http2-push-indicatorAldo Cortesi2016-10-297-100/+120
|\ \ | |/ |/| http2: add an indicator for pushed streams
| * http2: add push indicatorThomas Kriechbaumer2016-10-277-100/+120
|/
* Merge pull request #1685 from mhils/travisMaximilian Hils2016-10-271-0/+2
|\ | | | | fix travis
| * fix travisMaximilian Hils2016-10-271-0/+2
| |
* | Merge pull request #1684 from mhils/1675Maximilian Hils2016-10-271-1/+5
|\ \ | | | | | | Fix #1675
| * | fix #1675Maximilian Hils2016-10-271-1/+5
| | |
* | | Merge pull request #1671 from mitmproxy/bump-h2Maximilian Hils2016-10-273-18/+26
|\ \ \ | | | | | | | | Bump h2 version
| * | | upgrade h2 to >=2.5.0Thomas Kriechbaumer2016-10-273-18/+26
| | | |
| * | | bump h2 versionMaximilian Hils2016-10-271-1/+1
| | | |
* | | | Merge pull request #1681 from mhils/issue-1676Maximilian Hils2016-10-271-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | Fix #1676
| * | fix #1676Maximilian Hils2016-10-271-1/+1
|/ /
* / fix #1678Maximilian Hils2016-10-271-3/+4
|/
* Merge pull request #1680 from mhils/remove-lrucacheMaximilian Hils2016-10-271-32/+0
|\ | | | | Remove mitmproxy.utils.lrucache
| * remove mitmproxy.utils.lrucacheMaximilian Hils2016-10-271-32/+0
| |
* | fix pyinstaller buildsMaximilian Hils2016-10-273-3/+3
| |
* | Merge pull request #1670 from chhsiao90/display-cipher-#582Maximilian Hils2016-10-274-1/+19
|\ \ | |/ |/| Resolved #582: display ClientConnection select cipher of TLS
| * Show tls version on consolechhsiao902016-10-264-0/+9
| |
| * Resolved #582: display ClientConnection select cipher of TLSchhsiao902016-10-264-1/+10
| |
* | Merge pull request #1677 from cortesi/mypyAldo Cortesi2016-10-272-4/+5
|\ \ | | | | | | Add mypy to lint
| * | Add mypy to lintAldo Cortesi2016-10-272-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-1620Aldo Cortesi2016-10-274-9/+14
|\ \ | | | | | | fix #1620
| * | fix the linter, knuth ftw!Maximilian Hils2016-10-251-1/+1
| | |
| * | fix #1620Maximilian Hils2016-10-253-8/+13
| | |
* | | fix pyinstaller buildsMaximilian Hils2016-10-262-2/+2
| | |
* | | Update and rename README.mkd to README.mdMaximilian Hils2016-10-252-20/+8
| | |
* | | minor fixesMaximilian Hils2016-10-252-4/+4
|/ /
* | Merge pull request #1669 from mhils/typecheck-optionsMaximilian Hils2016-10-2516-20/+138
|\ \ | |/ |/| Typecheck options
| * typecheck options, fix current inconsistenciesMaximilian Hils2016-10-2516-21/+135
| |
| * make options keyword-onlyMaximilian Hils2016-10-254-0/+4
|/
* Merge pull request #1664 from chhsiao90/sni-display-#1639Maximilian Hils2016-10-244-1/+10
|\ | | | | Resolved #1639: display sni on ClientConnection
| * Resolved #1639: display sni on ClientConnectionchhsiao902016-10-254-1/+10
| |
* | Merge pull request #1656 from mhils/improve-export-2Maximilian Hils2016-10-247-162/+87
|\ \ | | | | | | Improve Flow Export
| * | improve flow exportMaximilian Hils2016-10-227-162/+87
| | |
* | | Merge pull request #1661 from slobo/patch-1Maximilian Hils2016-10-241-1/+1
|\ \ \ | |_|/ |/| | Include `boudary=...` in mutipart postData
| * | Include `boudary=...` in mutipart postData Slobodan Mišković2016-10-241-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_viewMaximilian Hils2016-10-241-2/+6
| | |
* | | replace mitmproxy.utils.lrucache with functools.lru_cacheSahil Chelaramani2016-10-243-49/+6
| | |
* | | disable erroneous linting errorsMaximilian Hils2016-10-241-8/+9
| | |
* | | add version check for Python 3.4-Maximilian Hils2016-10-241-0/+6
|/ /
* | Merge pull request #1649 from cortesi/killMaximilian Hils2016-10-223-3/+1
|\ \ | |/ |/| Don't call error for flow kill
| * Don't call error for flow killAldo Cortesi2016-10-223-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-encodingMaximilian Hils2016-10-225-16/+40
|\ \ | | | | | | Encoding Fixes
| * | various encoding fixes, fix #1650Maximilian Hils2016-10-225-25/+41
| | |
| * | Handle `bytes` in request parametersSlobodan Mišković2016-10-221-2/+10
| |/
* | Merge pull request #1653 from mhils/issue-1651Maximilian Hils2016-10-222-5/+8
|\ \ | |/ |/| Fix README Syntax (#1651)
| * add README.rst validation to CIMaximilian Hils2016-10-221-2/+6
| |
| * fix README syntaxMaximilian Hils2016-10-221-3/+2
|/
* Merge pull request #1648 from cortesi/consoleAldo Cortesi2016-10-221-1/+1
|\ | | | | console: give statusbar messages a default timeout