diff options
| author | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:30:03 +0100 |
|---|---|---|
| committer | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:30:03 +0100 |
| commit | 5bf6482bd08d4eadda36b9b6f67fbf34016c603d (patch) | |
| tree | d2056001b4f059e4efa06d31884cf33a8b156a17 /libmproxy/console.py | |
| parent | 2f813fa74818bcaaca8b0182eda004ea91a0d504 (diff) | |
| parent | 2ad4c5adf38e627fc4534548610235ce1c590c66 (diff) | |
| download | mitmproxy-5bf6482bd08d4eadda36b9b6f67fbf34016c603d.tar.gz mitmproxy-5bf6482bd08d4eadda36b9b6f67fbf34016c603d.tar.bz2 mitmproxy-5bf6482bd08d4eadda36b9b6f67fbf34016c603d.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'libmproxy/console.py')
| -rw-r--r-- | libmproxy/console.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 0f5a9e37..04e46064 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -47,7 +47,7 @@ def format_keyvals(lst, key="key", val="text", space=5, indent=0): def format_flow(f, focus, extended=False, padding=3): if not f.request and not f.response: txt = [ - ("title", " Connection from %s..."%(f.connection.address)), + ("title", " Connection from %s..."%(f.client_conn.address[0])), ] else: if extended: @@ -1263,7 +1263,7 @@ class ConsoleMaster(controller.Master): self.refresh_connection(f) # Handlers - def handle_browserconnection(self, r): + def handle_clientconnection(self, r): f = flow.Flow(r) self.state.add_browserconnect(f) r.ack() |