diff options
| author | Xavier Morel <xmo@tinyerp.com> | 2010-01-31 16:55:08 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@tinyerp.com> | 2010-01-31 16:55:08 +0100 |
| commit | f99cf9a615d8a4ebb2857440acecd4fac0ab9543 (patch) | |
| tree | d2f43a8cb27606c13bcb00c4bae5a776b2e58654 /bin/service/http_server.py | |
| parent | c3956443079e2846b4b988746586075914e207e4 (diff) | |
[fix] very badly broken HttpSDaemon
bzr revid: xmo@tinyerp.com-20100131155508-3uh7b9ahkwrsusat
Diffstat (limited to 'bin/service/http_server.py')
| -rw-r--r-- | bin/service/http_server.py | 6 |
1 files 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, |