From f99cf9a615d8a4ebb2857440acecd4fac0ab9543 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sun, 31 Jan 2010 16:55:08 +0100 Subject: [PATCH] [fix] very badly broken HttpSDaemon bzr revid: xmo@tinyerp.com-20100131155508-3uh7b9ahkwrsusat --- bin/service/http_server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/service/http_server.py b/bin/service/http_server.py index 9cbb49571dc..a35701dc9e5 100644 --- a/bin/service/http_server.py +++ b/bin/service/http_server.py @@ -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,