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 /libmproxy/flow.py | |
| 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 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 9115ec9d..eeb53e81 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -183,8 +183,7 @@ class ClientPlaybackState: """ if self.flows and not self.current: n = self.flows.pop(0) - n.request.reply = controller.DummyReply() - n.client_conn = None + n.reply = controller.DummyReply() self.current = master.handle_request(n) if not testing and not self.current.response: master.replay_request(self.current) # pragma: no cover |