diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
| commit | 2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (patch) | |
| tree | 72604de5152bdf15147a78e03a669a207baeac95 /libmproxy/protocol/__init__.py | |
| parent | 3032672f10c727623ee085d04d623901dac856df (diff) | |
| parent | 221973aff6553ffb1d40859c5d35b88d959f9718 (diff) | |
| download | mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.gz mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.bz2 mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/protocol/__init__.py')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 580d693c..2c2e7285 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -35,7 +35,6 @@ class TemporaryServerChangeMixin(object): This mixin allows safe modification of the target server, without any need to expose the ConnectionHandler to the Flow. """ - def change_server(self, address, ssl): if address == self.c.server_conn.address(): return @@ -98,4 +97,6 @@ def handle_messages(conntype, connection_handler): def handle_error(conntype, connection_handler, error): - return _handler(conntype, connection_handler).handle_error(error)
\ No newline at end of file + return _handler(conntype, connection_handler).handle_error(error) + + |