diff options
| author | nch@tinyerp.com <> | 2010-02-02 10:01:16 +0530 |
|---|---|---|
| committer | nch@tinyerp.com <> | 2010-02-02 10:01:16 +0530 |
| commit | 3d9d09f447d07deea2faa17036c6caf123ebe24f (patch) | |
| tree | 539c366f1828d777f185a34df0fbbe31fbf7c40c | |
| parent | 1238784de66184c29c61ee7c8b6b07476782644b (diff) | |
| parent | 9410d302bad307f2e1416efef53ee4b29038597f (diff) | |
[MERGE]
bzr revid: nch@tinyerp.com-20100202043116-8w8q25bl9s5ycbgv
| -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, |