Merge branch 'development'

Author: Pithikos

releases.txt

@@ -18,3 +18,6 @@
 0.6.0
 - Change order of params 'host' and 'port'
 - Add host attribute to server
+
+0.6.1
+- Sending data is now thread-safe

setup.py

@@ -12,7 +12,7 @@
     from distutils.command.install import install
 
 
-VERSION = '0.6.0'
+VERSION = '0.6.1'
 
 
 def get_tag_version():

websocket_server/websocket_server.py

@@ -219,6 +219,8 @@ class WebSocketHandler(StreamRequestHandler):
 
     def __init__(self, socket, addr, server):
         self.server = server
+        assert not hasattr(self, "_send_lock"), "_send_lock already exists"
+        self._send_lock = threading.Lock()
         if server.key and server.cert:
             try:
                 socket = ssl.wrap_socket(socket, server_side=True, certfile=server.cert, keyfile=server.key)
@@ -321,7 +323,8 @@ def send_close(self, status=CLOSE_STATUS_NORMAL, reason=DEFAULT_CLOSE_REASON):
         # Send CLOSE with status & reason
         header.append(FIN | OPCODE_CLOSE_CONN)
         header.append(payload_length)
-        self.request.send(header + payload)
+        with self._send_lock:
+            self.request.send(header + payload)
 
     def send_text(self, message, opcode=OPCODE_TEXT):
         """
@@ -364,7 +367,8 @@ def send_text(self, message, opcode=OPCODE_TEXT):
             raise Exception("Message is too big. Consider breaking it into chunks.")
             return
 
-        self.request.send(header + payload)
+        with self._send_lock:
+            self.request.send(header + payload)
 
     def read_http_headers(self):
         headers = {}
@@ -397,7 +401,8 @@ def handshake(self):
             return
 
         response = self.make_handshake_response(key)
-        self.handshake_done = self.request.send(response.encode())
+        with self._send_lock:
+            self.handshake_done = self.request.send(response.encode())
         self.valid_client = True
         self.server._new_client_(self)