diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-29 02:49:11 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-29 02:49:11 +0100 |
| commit | 607f7778110d5c2720e60ffcf5f4b0c94e8fcc5f (patch) | |
| tree | cd6249109b49936267cee0a30e0cb616288417d0 /libmproxy/flow.py | |
| parent | 1e3e0dd1271afda59ec244b64391b6579a998dce (diff) | |
| download | mitmproxy-607f7778110d5c2720e60ffcf5f4b0c94e8fcc5f.tar.gz mitmproxy-607f7778110d5c2720e60ffcf5f4b0c94e8fcc5f.tar.bz2 mitmproxy-607f7778110d5c2720e60ffcf5f4b0c94e8fcc5f.zip | |
fix most testsuite errors, improve proxy error handling
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index ee9031ba..acebb71d 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -835,7 +835,7 @@ class ClientConnect(StateObject): def _get_state(self): return dict( address = list(self.address), - requestcount = self.requestcount, + requestcount = -1, # FIXME self.requestcount, error = self.error, ) @@ -1599,6 +1599,7 @@ class FlowMaster(controller.Master): if r.is_live(): app = self.apps.get(r) if app: + # FIXME: for the tcp proxy, use flow.client_conn.wfile err = app.serve(r, r.wfile, **{"mitmproxy.master": self}) if err: self.add_event("Error in wsgi app. %s"%err, "error") |