Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | default should not be None | Colin Bendell | 2015-10-07 | 1 | -1/+1 |
| | | | Fixed default value when self.address has not been set | ||||
* | Check if server connection hasn't yet been initiated | Colin Bendell | 2015-10-07 | 1 | -2/+2 |
| | | | This fixes #761 when NoneType error is thrown when non-TLS requests initiate a client request but the server connection hasn't yet been initiated. | ||||
* | Merge pull request #792 from tunz/patch-1 | Maximilian Hils | 2015-10-04 | 1 | -1/+1 |
|\ | | | | | Correct a wrong link in CONTRIBUTING.md | ||||
| * | Update CONTRIBUTING.md | Choongwoo Han | 2015-10-04 | 1 | -1/+1 |
|/ | | | Wrong link | ||||
* | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2015-10-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #788 from sethp-jive/patch-1 | Maximilian Hils | 2015-10-01 | 1 | -1/+1 |
| |\ | | | | | | | Allow reading scripts from an anonymous pipe | ||||
| | * | Allow reading scripts from an anonymous pipe | sethp-jive | 2015-09-30 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | | | | | Bash (and many other shells) provide a nifty feature in "anonymous pipe" or "anonymous fifo" whereby the output of a subshell may be treated as a simple file by the parent shell: http://unix.stackexchange.com/a/156088 Unfortunately, libmproxy complains because that "file" is not a regular file, as os.path.isfile checks, e.g. giving the error "Not a file: /dev/fd/11". This patch is intended to provide for the following use-case: ``` mitmdump -s <(echo "def response(context, flow):\n flow.response.headers['newheader'] = [`hostname`]") ``` where `hostname` may be replaced with a more complicated lookup. | ||||
* / | fix #786 | Maximilian Hils | 2015-10-03 | 1 | -0/+5 |
|/ | |||||
* | fix #773 | Maximilian Hils | 2015-09-28 | 2 | -4/+19 |
| | |||||
* | fix tests | Maximilian Hils | 2015-09-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'http-models' | Maximilian Hils | 2015-09-28 | 18 | -206/+136 |
|\ | |||||
| * | move tests to netlib | Maximilian Hils | 2015-09-27 | 1 | -79/+0 |
| | | |||||
| * | adjust to netlib response changes + docs | Maximilian Hils | 2015-09-26 | 12 | -57/+58 |
| | | |||||
| * | adjust to netlib request changes + docs | Maximilian Hils | 2015-09-26 | 12 | -73/+81 |
| | | |||||
* | | handle Expect: 100-continue header, fix #770 | Maximilian Hils | 2015-09-28 | 5 | -5/+54 |
|/ | |||||
* | fix tests | Maximilian Hils | 2015-09-21 | 2 | -1/+2 |
| | |||||
* | appveyor: use py.test | Maximilian Hils | 2015-09-21 | 1 | -1/+1 |
| | |||||
* | experimental: run tests using py.tests | Maximilian Hils | 2015-09-21 | 11 | -15/+19 |
| | |||||
* | fix minor bugs, add py.test compatibility | Maximilian Hils | 2015-09-21 | 6 | -74/+32 |
| | |||||
* | fix replay functionality | Maximilian Hils | 2015-09-19 | 1 | -4/+4 |
| | |||||
* | don't cache changed messages, fix #777 | Maximilian Hils | 2015-09-19 | 1 | -2/+3 |
| | |||||
* | fix #778 | Maximilian Hils | 2015-09-19 | 2 | -3/+3 |
| | |||||
* | experimental: don't interfere with headers, fix #93 | Maximilian Hils | 2015-09-18 | 7 | -46/+40 |
| | |||||
* | trigger inline script hooks for artifical responses, fix #775 | Maximilian Hils | 2015-09-18 | 1 | -10/+11 |
| | |||||
* | remove old server replay workaround, fix #774 | Maximilian Hils | 2015-09-18 | 1 | -5/+1 |
| | |||||
* | code -> status_code, httpversion -> http_version | Maximilian Hils | 2015-09-17 | 16 | -63/+62 |
| | |||||
* | move body assembly to netlib | Maximilian Hils | 2015-09-17 | 1 | -11/+2 |
| | |||||
* | use new netlib exceptions | Maximilian Hils | 2015-09-17 | 12 | -53/+40 |
| | |||||
* | Merge pull request #768 from mitmproxy/netlib-http1-refactor | Maximilian Hils | 2015-09-16 | 23 | -251/+206 |
|\ | | | | | Adjust to netlib changes | ||||
| * | adjust to netlib changes | Maximilian Hils | 2015-09-16 | 23 | -251/+206 |
| | | |||||
* | | s/below/above/ | Maximilian Hils | 2015-09-16 | 1 | -1/+1 |
| | | |||||
* | | simplify test script | Maximilian Hils | 2015-09-16 | 1 | -2/+2 |
| | | |||||
* | | make pypi happy | Maximilian Hils | 2015-09-16 | 1 | -7/+5 |
| | | |||||
* | | improve readme | Maximilian Hils | 2015-09-16 | 6 | -118/+162 |
| | | |||||
* | | Merge pull request #751 from mitmproxy/readthedocs | Maximilian Hils | 2015-09-16 | 144 | -9069/+2560 |
|\ \ | |/ |/| | Move Docs to readthedocs | ||||
| * | docs: add travis integration | Maximilian Hils | 2015-09-08 | 1 | -4/+5 |
| | | |||||
| * | Merge branch 'master' into readthedocs | Maximilian Hils | 2015-09-08 | 8 | -27/+44 |
| |\ | |||||
| * | | docs: update documentedlist, add filter table headers | Maximilian Hils | 2015-09-08 | 3 | -15/+16 |
| | | | |||||
| * | | docs: minor fixes | Maximilian Hils | 2015-09-07 | 31 | -80/+93 |
| | | | |||||
| * | | remove old docs | Maximilian Hils | 2015-09-07 | 107 | -9380/+0 |
| | | | |||||
| * | | docs :tada: | Maximilian Hils | 2015-09-06 | 30 | -7/+872 |
| | | | |||||
| * | | Merge branch 'master' into readthedocs | Maximilian Hils | 2015-09-06 | 22 | -252/+229 |
| |\ \ | |||||
| * | | | docs++ | Maximilian Hils | 2015-09-06 | 11 | -11/+210 |
| | | | | |||||
| * | | | finish tools section | Maximilian Hils | 2015-09-05 | 2 | -2/+83 |
| | | | | |||||
| * | | | docs++ | Maximilian Hils | 2015-09-05 | 10 | -9/+211 |
| | | | | |||||
| * | | | doc: headers class | Maximilian Hils | 2015-09-05 | 1 | -1/+6 |
| | | | | |||||
| * | | | rewrite basic docs for readthedocs | Maximilian Hils | 2015-09-04 | 62 | -29/+828 |
| | | | | |||||
| * | | | Merge branch 'master' into readthedocs | Maximilian Hils | 2015-09-04 | 10 | -34/+19 |
| |\ \ \ | |||||
| * | | | | docs, docs, docs! | Maximilian Hils | 2015-09-04 | 9 | -19/+254 |
| | | | | | |||||
| * | | | | add dev docs | Maximilian Hils | 2015-09-03 | 7 | -0/+470 |
| | | | | |