From 214eb96758d6aa3922d98d13b84485a8ffa77f33 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 8 Sep 2009 11:15:16 +0300 Subject: [PATCH] HTTPSd: fix crash of server when no ssl available. bzr revid: p_christ@hol.gr-20090908081516-hnbdn0mvqfy06qws --- bin/service/http_server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/service/http_server.py b/bin/service/http_server.py index 788497926bd..5caca912dbe 100644 --- a/bin/service/http_server.py +++ b/bin/service/http_server.py @@ -44,6 +44,11 @@ try: import fcntl except ImportError: fcntl = None + +try: + from ssl import SSLError +except ImportError: + class SSLError(Exception): pass class ThreadedHTTPServer(ConnThreadingMixIn, SimpleXMLRPCDispatcher, HTTPServer): """ A threaded httpd server, with all the necessary functionality for us. @@ -145,8 +150,6 @@ class HttpSDaemon(threading.Thread, netsvc.Server): self.__port = port self.__interface = interface - from ssl import SSLError - try: self.server = ThreadedHTTPServer((interface, port), SecureMultiHandler2) self.server.vdirs = []