From 8394f59acd639f4a89c8010590819c773b1b803e Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Mon, 24 Jan 2011 13:09:26 -0600 Subject: SSLServer: Stop raising trapped exceptions from XMLRPCRequestHandler. Causes the server to wedge. (Resolves #970) --- src/lib/SSLServer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py index 7c5b76664..1f4c1c8e4 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/SSLServer.py @@ -262,10 +262,12 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): self.logger.warning("Connection dropped from %s" % self.client_address[0]) elif str(type) == 'socket.error' and msg[0] == 104: self.logger.warning("Connection reset by peer: %s" % self.client_address[0]) + elif str(type) == 'ssl.SSLError': + self.logger.warning("SSLError handling client %s: %s" % \ + (self.client_address[0], msg)) else: self.logger.error("Error sending response (%s): %s" % \ (type, msg)) - raise def finish(self): # shut down the connection -- cgit v1.2.3-1-g7c22