From 2b9c12af43e52d77356c2991d7b0b11b9c96bacb Mon Sep 17 00:00:00 2001
From: ced <>
Date: Mon, 13 Aug 2007 07:49:59 +0000
Subject: [PATCH] Fix stop server with ssl enable

bzr revid: ced-1315f63f508c4e7ad1fcfbdfb73ee10af5a9b894
---
 bin/netsvc.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index 427c7fa1b44..70fa3ca851a 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -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):