[MERGE]

bzr revid: nch@tinyerp.com-20100202043116-8w8q25bl9s5ycbgv
2010-02-02 10:01:16 +05:30
parent 1238784de6 9410d302ba
commit 3d9d09f447
1 changed files with 3 additions and 3 deletions
@@ -161,11 +161,11 @@ class HttpDaemon(BaseHttpDaemon):
        super(HttpDaemon, self).__init__(interface, port,
                                         handler=MultiHandler2)

-class HttpSDaemon(threading.Thread, netsvc.Server):
+class HttpSDaemon(BaseHttpDaemon):
    def __init__(self, interface, port):
        try:
-            super(HttpDaemon, self).__init__(interface, port,
-                                             handler=SecureMultiHandler2)
+            super(HttpSDaemon, self).__init__(interface, port,
+                                              handler=SecureMultiHandler2)
        except SSLError, e:
            netsvc.Logger().notifyChannel(
                'httpd-ssl', netsvc.LOG_CRITICAL,