odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Fix stop server with ssl enable 

bzr revid: ced-1315f63f508c4e7ad1fcfbdfb73ee10af5a9b894
This commit is contained in:
ced 2007-08-13 07:49:59 +00:00
parent a3bad70291
commit 2b9c12af43
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/netsvc.py
View File

@ -245,6 +245,7 @@ class HttpDaemon(threading.Thread):
threading.Thread.__init__(self)
self.__port=port
self.__interface=interface
self.secure = secure
if secure and HAS_SSL:
self.server = SecureThreadedXMLRPCServer((interface, port), SecureXMLRPCRequestHandler,0)
else:
@ -257,9 +258,15 @@ class HttpDaemon(threading.Thread):
self.running = False
if os.name <> 'nt':
if hasattr(socket, 'SHUT_RDWR'):
self.server.socket.shutdown(socket.SHUT_RDWR)
if self.secure:
self.server.socket.sock_shutdown(socket.SHUT_RDWR)
else:
self.server.socket.shutdown(socket.SHUT_RDWR)
else:
self.server.socket.shutdown(2)
if self.secure:
self.server.socket.sock_shutdown(2)
else:
self.server.socket.shutdown(2)
self.server.socket.close()
def run(self):