aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* server replay: keep --kill activeMaximilian Hils2016-04-093-16/+6
|
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-091-1/+1
|\
| * Fix being unable to export binary data in requests (#1069)Anthony Zhang2016-04-091-1/+1
| |
* | fix client playback logicMaximilian Hils2016-04-091-7/+8
|/
* fix server replay shutdownMaximilian Hils2016-04-091-11/+19
|
* add sphinx_rtd_theme as a dependencyMaximilian Hils2016-04-031-0/+1
|
* Merge branch 'better-replace'Maximilian Hils2016-04-0310-65/+100
|\
| * improve .replace() and move it into netlibMaximilian Hils2016-04-0210-65/+100
| |
* | update dependenciesMaximilian Hils2016-04-031-6/+5
| |
* | Merge pull request #1076 from mitmproxy/issue-1061Thomas Kriechbaumer2016-04-032-21/+19
|\ \ | | | | | | Fix #1061
| * | fix #1061Maximilian Hils2016-04-022-21/+19
| | |
* | | Merge pull request #1074 from mitmproxy/move-response-refreshThomas Kriechbaumer2016-04-036-93/+107
|\ \ \ | | | | | | | | move HTTPResponse.refresh into netlib
| * | | move HTTPResponse.refresh into netlibMaximilian Hils2016-04-026-93/+107
| | | |
* | | | Merge pull request #1073 from mitmproxy/first-line-formatThomas Kriechbaumer2016-04-039-76/+37
|\ \ \ \ | | | | | | | | | | form_(in|out) -> first_line_format
| * | | | form_(in|out) -> first_line_formatMaximilian Hils2016-04-029-76/+37
| | | | |
* | | | | Merge pull request #1072 from mitmproxy/remove-response-msgThomas Kriechbaumer2016-04-035-15/+4
|\ \ \ \ \ | |_|/ / / |/| | | | response.msg -> response.reason
| * | | | response.msg -> response.reasonMaximilian Hils2016-04-025-15/+4
|/ / / /
* / / / minor simplificationsMaximilian Hils2016-04-022-4/+1
|/ / /
* | | improve timing displayMaximilian Hils2016-04-022-58/+64
| | |
* | | fix FlowMaster.create_request, add testMaximilian Hils2016-04-022-0/+6
| | |
* | | fix #1052Maximilian Hils2016-04-021-1/+1
|/ /
* | fix #1067Maximilian Hils2016-04-021-1/+1
| |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-021-1/+2
|\ \ | |/ |/|
| * Merge pull request #1066 from fimad/masterMaximilian Hils2016-03-311-1/+2
| |\ | | | | | | Fix XSS vulnerability in HTTP errors
| | * Fix XSS vulnerability in HTTP errorsWill Coster2016-03-311-1/+2
| |/ | | | | | | | | | | | | | | | | | | The make_error_response method does not properly escape characters that end up in the response body. Since the error code can contain user supplied values this leads to a potential XSS vulnerability. Example: echo '<script>alert(1)</script>' | nc localhost 8888
* / add Serializeable.copyMaximilian Hils2016-04-027-19/+34
|/
* travis: checkout full repo for buildsMaximilian Hils2016-03-311-0/+2
|
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-03-3129-90/+377
|\
| * Merge pull request #1050 from zlorb/masterMaximilian Hils2016-03-295-2/+281
| |\ | | | | | | Flow export to locust.io load test tool [http://locust.io]
| | * Merge remote-tracking branch 'mitmproxy/master'Zohar Lorberbaum2016-03-280-0/+0
| | |\ | | |/ | |/| | | | | | | # Conflicts: # test/mitmproxy/test_flow_export.py
| * | add safeguardThomas Kriechbaumer2016-03-271-1/+2
| | |
| * | improve flow export testsThomas Kriechbaumer2016-03-271-2/+23
| | |
| * | s/nocover/no cover/gThomas Kriechbaumer2016-03-2712-33/+32
| | | | | | | | | according to coveralls docs
| * | increase test timeoutThomas Kriechbaumer2016-03-271-1/+1
| | |
| * | Merge pull request #1055 from MatthewShao/issue#963Thomas Kriechbaumer2016-03-2715-51/+38
| |\ \ | | | | | | | | Simplify '.content' by removing CONTENT_MISSING
| | * | minor fix about if-else statementMatthew Shao2016-03-271-3/+1
| | | |
| | * | update commentsMatthew Shao2016-03-263-7/+7
| | | |
| | * | update document for the removal of CONTENT_MISSINGMatthew Shao2016-03-261-2/+1
| | | |
| | * | replace CONTENT_MISSING with None.Matthew Shao2016-03-2614-47/+37
| | | |
| | * | Setting CONTENT_MISSING to NoneMatthew Shao2016-03-261-1/+1
| |/ /
| | * mergeZohar Lorberbaum2016-03-281-1/+0
| | |
| | * Merge remote-tracking branch 'mitmproxy/master'Zohar Lorberbaum2016-03-281-1/+0
| | | | | | | | | | | | Merge with master
| | * Merge with masterZohar Lorberbaum2016-03-2827-86/+96
| | |
| | * cleaner target urlZohar Lorberbaum2016-03-282-6/+7
| | |
| | * locust_task re-use locust_code.Zohar Lorberbaum2016-03-272-69/+25
| | |
| | * pep8Zohar Lorberbaum2016-03-252-20/+20
| | |
| | * Add UI shortcuts.Zohar Lorberbaum2016-03-245-0/+18
| | |
| | * Flow export to locust.io load test tool.Zohar Lorberbaum2016-03-232-4/+308
| |/
* / snapshots: fix build tagMaximilian Hils2016-03-311-1/+2
|/
* py3++Maximilian Hils2016-03-204-22/+30
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:13:24 +0000