summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/SSLServer.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index 2bdb5ea73..ff2b1958c 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -129,12 +129,16 @@ class SSLServer (SocketServer.TCPServer, object):
def get_request(self):
(sock, sockinfo) = self.socket.accept()
- sock.settimeout(90)
sslsock = ssl.wrap_socket(sock, server_side=True, certfile=self.certfile,
keyfile=self.keyfile, cert_reqs=self.mode,
ca_certs=self.ca, ssl_version=self.ssl_protocol)
return sslsock, sockinfo
+ def close_request(self, request):
+ request.unwrap()
+ request.shutdown(2)
+ request.close()
+
def _get_url(self):
port = self.socket.getsockname()[1]
hostname = socket.gethostname()
@@ -223,9 +227,6 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
self.wfile.flush()
self.wfile.close()
self.rfile.close()
- self.connection.unwrap()
- self.connection.close()
- os.close(self.connection.fileno())
class XMLRPCServer (SocketServer.ThreadingMixIn, SSLServer,
XMLRPCDispatcher, object):