From 75e789c15fc99518857fecccbb8d0553f03456a3 Mon Sep 17 00:00:00 2001 From: Vangelis Banos Date: Thu, 9 May 2019 20:44:47 +0000 Subject: [PATCH] Add entries to bad_hostnames_ports only on connection init Do not add entries to bad_hostnames_ports during connection running if an exception occurs. Do it only on connection init because for some unclear reason unit tests fail in that case. --- warcprox/mitmproxy.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/warcprox/mitmproxy.py b/warcprox/mitmproxy.py index c2c4183..39469d5 100644 --- a/warcprox/mitmproxy.py +++ b/warcprox/mitmproxy.py @@ -549,12 +549,6 @@ class MitmProxyHandler(http_server.BaseHTTPRequestHandler): if not is_connection_dropped(self._remote_server_conn): self._conn_pool._put_conn(self._remote_server_conn) except Exception as e: - if type(e) in (socket.timeout, NewConnectionError): - with self.server.bad_hostnames_ports_lock: - hostname_port = self._hostname_port_cache_key() - self.server.bad_hostnames_ports[hostname_port] = 1 - self.logger.info('bad_hostnames_ports cache size: %d', - len(self.server.bad_hostnames_ports)) self._remote_server_conn.sock.shutdown(socket.SHUT_RDWR) self._remote_server_conn.sock.close() raise