diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-18 15:59:44 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-18 15:59:44 +0200 |
| commit | ab1549e0eff98588211346aada44549311f04938 (patch) | |
| tree | d5fa78c1d639d5f63f60b637821496c05ec1da18 /libmproxy/proxy/server.py | |
| parent | 96de7ad562da9b5110059988b851c66b51874510 (diff) | |
| download | mitmproxy-ab1549e0eff98588211346aada44549311f04938.tar.gz mitmproxy-ab1549e0eff98588211346aada44549311f04938.tar.bz2 mitmproxy-ab1549e0eff98588211346aada44549311f04938.zip | |
yield -> callbacks
Diffstat (limited to 'libmproxy/proxy/server.py')
| -rw-r--r-- | libmproxy/proxy/server.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index e23a7d72..9957caa0 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -3,6 +3,7 @@ from __future__ import absolute_import, print_function import traceback import sys import socket +from libmproxy.protocol2.layer import Kill from netlib import tcp from ..protocol.handle import protocol_handler @@ -88,12 +89,9 @@ class ConnectionHandler2: root_layer = protocol2.HttpProxy(root_context) try: - for message in root_layer(): - if message == protocol2.messages.Kill: - self.log("Connection killed", "info") - break - - print("Root layer receveived: %s" % message) + root_layer() + except Kill as e: + self.log("Connection killed", "info") except ProtocolException as e: self.log(e, "info") except Exception: |