summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar mkaay <mkaay@mkaay.de> 2009-11-22 17:44:03 +0100
committerGravatar mkaay <mkaay@mkaay.de> 2009-11-22 17:44:03 +0100
commitb391a5b9061d7d41bf1ae7df71f5a5e64b8491e8 (patch)
treefb44e30268b395d64a93e1f4a3de8c3c7fc475f8
parentFixed DLC Plugin (diff)
downloadpyload-b391a5b9061d7d41bf1ae7df71f5a5e64b8491e8.tar.xz
fixed SecureXMLRPCServer
-rw-r--r--module/remote/SecureXMLRPCServer.py3
-rwxr-xr-xpyLoadCore.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/module/remote/SecureXMLRPCServer.py b/module/remote/SecureXMLRPCServer.py
index fb666b4ab..158e44863 100644
--- a/module/remote/SecureXMLRPCServer.py
+++ b/module/remote/SecureXMLRPCServer.py
@@ -75,6 +75,9 @@ class SecureXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
class SecureXMLRPCServer(SecureSocketServer, SimpleXMLRPCServer):
def __init__(self, address, cert, key, authenticationMap = None, handler=SecureXMLRPCRequestHandler, verify_cert_func=None):
self.logRequests = False
+ self._send_traceback_header = False
+ self.encoding = "utf-8"
+ self.allow_none = True
SecureSocketServer.__init__(self, address, cert, key, handler, verify_cert_func)
# This comes from SimpleXMLRPCServer.__init__()->SimpleXMLRPCDispatcher.__init__()
self.funcs = {}
diff --git a/pyLoadCore.py b/pyLoadCore.py
index a0e645fb2..671cc7585 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -255,6 +255,7 @@ class Core(object):
def init_server(self):
try:
self.server = SecureXMLRPCServer(("", 1337), "ssl.crt", "ssl.key", {"testuser":"testpw"})
+ self.server.register_introspection_functions()
self.server.register_function(self.status_downloads)
self.server.register_function(self.status_server)
self.server.register_function(self.kill)