Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-09-30 | 2 | -3/+6 |
|\ | |||||
| * | fix typo | Maximilian Hils | 2016-09-28 | 1 | -1/+1 |
| | | |||||
| * | fix host header modification, refs #1571 | Maximilian Hils | 2016-09-28 | 1 | -2/+5 |
| | | |||||
* | | docs: minor formatting/cleanups | Aldo Cortesi | 2016-09-30 | 2 | -39/+13 |
| | | |||||
* | | docs: remove auto-generated stubs | Aldo Cortesi | 2016-09-30 | 4 | -41/+0 |
| | | | | | | | | | | | | These are too verbose/low info for these docs. We should include pointers to where to start reading the code, and perhaps later we can include full auto-generated API docs separately. | ||||
* | | docs: make sidebar headings more legible | Aldo Cortesi | 2016-09-30 | 1 | -0/+4 |
|/ | |||||
* | parse_set_cookie header returns an empty list if no cookies are found | Aldo Cortesi | 2016-09-28 | 2 | -12/+7 |
| | | | | This matches parse_cookie, and is more idiomatic. | ||||
* | Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxy | Aldo Cortesi | 2016-09-28 | 4 | -185/+269 |
|\ | |||||
| * | Clarify that 'expires' values MUST have a comma now | Shadab Zafar | 2016-09-27 | 1 | -1/+4 |
| | | |||||
| * | Add tests for comma separated Set-Cookies | Shadab Zafar | 2016-09-27 | 1 | -10/+47 |
| | | |||||
| * | Modify format_set_cookie_header to take cookie list | Shadab Zafar | 2016-09-27 | 2 | -15/+24 |
| | | | | | | | | and return a comma separated string of cookies | ||||
| * | Fixup an error with indices | Shadab Zafar | 2016-09-27 | 1 | -1/+1 |
| | | |||||
| * | Can't have , in the sticky cookie test | Shadab Zafar | 2016-09-27 | 1 | -1/+0 |
| | | | | | | | | Since we support comma separated cookies now | ||||
| * | Make needed changes in tests | Shadab Zafar | 2016-09-27 | 1 | -30/+33 |
| | | |||||
| * | Refactor functions | Shadab Zafar | 2016-09-27 | 1 | -35/+26 |
| | | |||||
| * | Add a new pairs reader for SetCookie headers | Shadab Zafar | 2016-09-27 | 1 | -3/+15 |
| | | |||||
| * | Rename _read_pairs to _read_cookie_pairs | Shadab Zafar | 2016-09-27 | 1 | -3/+22 |
| | | | | | | | | We will have a separate _read_set_cookie_pairs | ||||
| * | Rename _read_token to _read_key | Shadab Zafar | 2016-09-27 | 1 | -8/+8 |
| | | | | | | | | Since we also have a _read_value | ||||
| * | Move CookieAttrs and SetCookie to top | Shadab Zafar | 2016-09-27 | 1 | -18/+14 |
| | | |||||
| * | Minor refactor | Shadab Zafar | 2016-09-27 | 1 | -2/+3 |
| | | |||||
| * | Update cookie tests | Shadab Zafar | 2016-09-27 | 1 | -91/+84 |
| | | | | | | | | | | This is needed since _read_pairs now returns a list of cookies each of which is a list of [name, value] tuples. | ||||
| * | Add support for comma separated cookies | Shadab Zafar | 2016-09-27 | 1 | -30/+51 |
| | | |||||
* | | Merge pull request #1571 from rofreg/server-sni-flag | Maximilian Hils | 2016-09-27 | 3 | -4/+10 |
|\ \ | |/ |/| | Add command line arg to force specific SNI | ||||
| * | In reverse proxy mode, always send SNI | Ryan Laughlin | 2016-09-27 | 3 | -4/+10 |
|/ | |||||
* | Merge pull request #1583 from mhils/patch-makesocket | Thomas Kriechbaumer | 2016-09-27 | 1 | -1/+5 |
|\ | | | | | allow socket creation monkeypatchs | ||||
| * | allow socket creation monkeypatchs | Maximilian Hils | 2016-09-27 | 1 | -1/+5 |
| | | |||||
* | | Update reverse proxy host header docs | Ryan Laughlin | 2016-09-26 | 1 | -24/+9 |
| | | |||||
* | | override host header in reverse proxy mode, refs #1571 | Maximilian Hils | 2016-09-26 | 1 | -0/+4 |
|/ | |||||
* | Revert "minor fixes" | Maximilian Hils | 2016-09-26 | 1 | -5/+8 |
| | | | | This reverts commit f94219e7377e6eb775867918f7a1382421a97c54. | ||||
* | minor fixes | Maximilian Hils | 2016-09-26 | 1 | -8/+5 |
| | |||||
* | Fixes - #1555 sslstrip.py flow.response.headers (#1556) | phackt | 2016-09-25 | 1 | -2/+14 |
| | | | | | | | | | | * Fixes - #1555 sslstrip.py flow.response.headers * #1557 - add enhancements in inline script sslstrip.py with upgrade-insecure-requests stripping * #1557 - update to match python style guide * #1555, #1556, update to a bytes pattern | ||||
* | fix #1221 (#1578) | Maximilian Hils | 2016-09-24 | 2 | -9/+19 |
| | |||||
* | update dependencies, minor fixes (#1577) | Maximilian Hils | 2016-09-24 | 4 | -13/+14 |
| | |||||
* | fix tests | Maximilian Hils | 2016-09-24 | 1 | -1/+1 |
| | |||||
* | minor fixes | Maximilian Hils | 2016-09-24 | 2 | -4/+3 |
| | |||||
* | remove option argument for addons.add (#1576) | Maximilian Hils | 2016-09-24 | 19 | -33/+32 |
| | |||||
* | minor cleanups | Maximilian Hils | 2016-09-24 | 2 | -4/+4 |
| | |||||
* | fix #1492 | Maximilian Hils | 2016-09-24 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1574 from mhils/issue-1393 | Thomas Kriechbaumer | 2016-09-24 | 5 | -19/+32 |
|\ | | | | | Fix #1393 | ||||
| * | fix #1393 | Maximilian Hils | 2016-09-23 | 5 | -19/+32 |
|/ | |||||
* | Merge pull request #1566 from mhils/issue-1546 | Maximilian Hils | 2016-09-22 | 7 | -46/+66 |
|\ | | | | | add websocket on/off switch, improve logging (fix #1546, fix #1547) | ||||
| * | fix tests | Maximilian Hils | 2016-09-22 | 2 | -6/+8 |
| | | |||||
| * | add websocket on/off switch, improve logging (fix #1546, fix #1547) | Maximilian Hils | 2016-09-22 | 6 | -49/+67 |
| | | |||||
* | | Merge pull request #1567 from mhils/issue-1467 | Maximilian Hils | 2016-09-22 | 2 | -8/+55 |
|\ \ | |/ |/| | Scripts: cut traceback properly, fix #1467 | ||||
| * | scripts: cut traceback properly, fix #1467 | Maximilian Hils | 2016-09-22 | 2 | -8/+55 |
| | | |||||
* | | Merge branch 'fully_transparent' | Maximilian Hils | 2016-09-22 | 7 | -7/+154 |
|\ \ | |/ |/| | |||||
| * | minor cleanup | Maximilian Hils | 2016-09-22 | 3 | -17/+11 |
| | | |||||
| * | Removed obsolete code. | smill@cuckoo.sh | 2016-09-22 | 1 | -6/+2 |
| | | |||||
| * | Introduced comment regarding socket manipulation through the server_conn stub. | smill@cuckoo.sh | 2016-09-22 | 1 | -0/+1 |
| | | |||||
| * | Commented on IP_TRANSPARENT and changed an exception type. | smill@cuckoo.sh | 2016-09-22 | 1 | -1/+2 |
| | |