Stop allowing CORS for the JSON-RPC server

from upstream #3659, 

spesmilo/electrum#3374

lib/daemon.py

@@ -29,7 +29,7 @@
 import time
 
 import jsonrpclib
-from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
+from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
 
 from version import ELECTRUM_VERSION
 from network import Network
@@ -85,19 +85,6 @@ def get_server(config):
 
 
 
-class RequestHandler(SimpleJSONRPCRequestHandler):
-
-    def do_OPTIONS(self):
-        self.send_response(200)
-        self.end_headers()
-
-    def end_headers(self):
-        self.send_header("Access-Control-Allow-Headers",
-                         "Origin, X-Requested-With, Content-Type, Accept")
-        self.send_header("Access-Control-Allow-Origin", "*")
-        SimpleJSONRPCRequestHandler.end_headers(self)
-
-
 class Daemon(DaemonThread):
 
     def __init__(self, config, fd):
@@ -124,8 +111,7 @@ def init_server(self, config, fd):
         host = config.get('rpchost', '127.0.0.1')
         port = config.get('rpcport', 0)
         try:
-            server = SimpleJSONRPCServer((host, port), logRequests=False,
-                                         requestHandler=RequestHandler)
+            server = SimpleJSONRPCServer((host, port), logRequests=False)
         except:
             self.print_error('Warning: cannot initialize RPC server on host', host)
             self.server = None