aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-08-10 16:10:49 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-08-10 16:10:49 +0200
commit858b0af0bbcbf3c26e71c0b6e33b5de3a8f31c75 (patch)
treea35834b8488abdb4d7ed5621fe1c9c9cf9a70ef6 /libmproxy/proxy
parentecf8081ba63f15ec283979a3418951711ec30071 (diff)
downloadmitmproxy-858b0af0bbcbf3c26e71c0b6e33b5de3a8f31c75.tar.gz
mitmproxy-858b0af0bbcbf3c26e71c0b6e33b5de3a8f31c75.tar.bz2
mitmproxy-858b0af0bbcbf3c26e71c0b6e33b5de3a8f31c75.zip
fix #270
Diffstat (limited to 'libmproxy/proxy')
-rw-r--r--libmproxy/proxy/primitives.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/libmproxy/proxy/primitives.py b/libmproxy/proxy/primitives.py
index 6154749c..dc4b7e22 100644
--- a/libmproxy/proxy/primitives.py
+++ b/libmproxy/proxy/primitives.py
@@ -40,9 +40,10 @@ class TransparentUpstreamServerResolver(UpstreamServerResolver):
self.sslports = sslports
def __call__(self, conn):
- dst = self.resolver.original_addr(conn)
- if not dst:
- raise ProxyError(502, "Transparent mode failure: could not resolve original destination.")
+ try:
+ dst = self.resolver.original_addr(conn)
+ except Exception, e:
+ raise ProxyError(502, "Transparent mode failure: %s" % str(e))
if dst[1] in self.sslports:
ssl = True