X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=transports%2Fstratum_http.py;h=4efdb97b1dff5e5324e7e9db781ca3a7127aab9f;hb=ba0781f46f32e09e12e50c74cf7575429e04f36c;hp=c4fe06a5e98782c53acba2abc248c4a36b9522cd;hpb=55234cf1fcf6260b8c3d67b7c4f4969f22e6677f;p=electrum-server.git

diff --git a/transports/stratum_http.py b/transports/stratum_http.py
index c4fe06a..4efdb97 100644
--- a/transports/stratum_http.py
+++ b/transports/stratum_http.py
@@ -192,7 +192,7 @@ class StratumJSONRPCRequestHandler(
         self.end_headers()
         self.wfile.write(response)
         self.wfile.flush()
-        self.connection.shutdown(1)
+        self.shutdown_connection()
 
 
     def do_POST(self):
@@ -241,20 +241,26 @@ class StratumJSONRPCRequestHandler(
         self.end_headers()
         self.wfile.write(response)
         self.wfile.flush()
+        self.shutdown_connection()
+
+    def shutdown_connection(self):
         self.connection.shutdown(1)
 
 
+class SSLRequestHandler(StratumJSONRPCRequestHandler):
+    def setup(self):
+        self.connection = self.request
+        self.rfile = socket._fileobject(self.request, "rb", self.rbufsize)
+        self.wfile = socket._fileobject(self.request, "wb", self.wbufsize)
 
+    def shutdown_connection(self):
+        self.connection.shutdown()
 
-class SSLTCPServer(SocketServer.TCPServer):
 
+class SSLTCPServer(SocketServer.TCPServer):
     def __init__(self, server_address, certfile, keyfile, RequestHandlerClass, bind_and_activate=True):
         SocketServer.BaseServer.__init__(self, server_address, RequestHandlerClass)
         ctx = SSL.Context(SSL.SSLv3_METHOD)
-        self.certfile = certfile
-        self.keyfile = keyfile
-        #certfile = '/etc/ssl/certs/cacert.pem'
-        #keyfile = '/etc/ssl/private/cakey.pem'
         ctx.use_privatekey_file(keyfile)
         ctx.use_certificate_file(certfile)
         self.socket = SSL.Connection(ctx, socket.socket(self.address_family, self.socket_type))
@@ -263,7 +269,8 @@ class SSLTCPServer(SocketServer.TCPServer):
             self.server_activate()
 
     def shutdown_request(self,request):
-        request.shutdown()
+        #request.shutdown()
+        pass
 
 
 class StratumHTTPServer(SocketServer.TCPServer, StratumJSONRPCDispatcher):
@@ -302,7 +309,7 @@ class StratumHTTPSSLServer(SSLTCPServer, StratumJSONRPCDispatcher):
     allow_reuse_address = True
 
     def __init__(self, addr, certfile, keyfile,
-                 requestHandler=StratumJSONRPCRequestHandler,
+                 requestHandler=SSLRequestHandler,
                  logRequests=False, encoding=None, bind_and_activate=True,
                  address_family=socket.AF_INET):