Denis Bilenko avatar Denis Bilenko committed 2f2d631

fix close(): previously it might have caused receive() to hang

- also make send_frame() raise WebSocketError if the connection was already closed

Comments (0)

Files changed (1)

geventwebsocket/websocket.py

                 return -1
 
         def close(self):
-            if self.closed:
+            if self._sock is None:
                 return
+            self._sock.close()
+            self._sock = None
             RawIOBase.close(self)
-            self._sock = None
 
     def makefile(socket):
         return BufferedReader(SocketIO(socket))
 
     def send_frame(self, message, opcode):
         """Send a frame over the websocket with message as its payload"""
+        if self.socket is None:
+            raise WebSocketError('The connection was closed')
+
         header = chr(0x80 | opcode)
 
         if isinstance(message, unicode):
         """Close the websocket, sending the specified code and message"""
         if self.socket is not None:
             message = self._encode_text(message)
-            self.send_frame(struct.pack('!H%ds' % len(message), code, message), opcode=self.OPCODE_CLOSE)
-            self._close()
+            try:
+                self.send_frame(struct.pack('!H%ds' % len(message), code, message), opcode=self.OPCODE_CLOSE)
+            finally:
+                self._close()
 
     def _close(self):
         if self.socket is not None:
-            self.socket._sock.close()
             self.socket = None
             self._write = None
-            fobj = self.fobj
+            if not self._reading:
+                self.fobj.close()
             self.fobj = None
-            if not self._reading:
-                fobj.close()
+
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.