diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-04 00:11:20 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-04 00:11:20 +0200 |
| commit | ea55f2e0122352934aa98fc1ea41230b280d5915 (patch) | |
| tree | ae74e679a2d2f7e7cb596b54726ea0652ccb907a /examples | |
| parent | 2f44b26b4cd014e03dd62a125d79af9b81663a93 (diff) | |
| parent | 649e63ff3c868397f493e1dabdc1c63d572aedd8 (diff) | |
| download | mitmproxy-ea55f2e0122352934aa98fc1ea41230b280d5915.tar.gz mitmproxy-ea55f2e0122352934aa98fc1ea41230b280d5915.tar.bz2 mitmproxy-ea55f2e0122352934aa98fc1ea41230b280d5915.zip | |
Merge branch 'issue_341' into server_change_api
Conflicts:
examples/redirect_requests.py
libmproxy/console/common.py
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/redirect_requests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/redirect_requests.py b/examples/redirect_requests.py index b57df2b2..cc642039 100644 --- a/examples/redirect_requests.py +++ b/examples/redirect_requests.py @@ -12,7 +12,7 @@ def request(context, flow): [1, 1], 200, "OK", ODictCaseless([["Content-Type", "text/html"]]), "helloworld") - flow.request.reply(resp) + flow.reply(resp) if flow.request.pretty_host(hostheader=True).endswith("example.org"): flow.request.host = "mitmproxy.org" flow.request.update_host_header() |