- fix binary frame type bug.

2 files changed, 5 insertions, 3 deletions

diff --git a/test_websocket.py b/test_websocket.py
index e2ff829..15598ed 100644
--- a/test_websocket.py
+++ b/test_websocket.py
@@ -165,11 +165,11 @@ class WebSocketTest(unittest.TestCase):
         data = sock.recv()
         self.assertEquals(data, "こんにちは")
         
-        s.set_data("\x01\x05Hello")
+        s.set_data("\x81\x05Hello")
         data = sock.recv()
         self.assertEquals(data, "Hello")
 
-        s.set_data("\x01\x81\x7f" + ("a"*255))
+        s.set_data("\x81\x81\x7f" + ("a"*255))
         data = sock.recv()
         self.assertEquals(len(data), 255)
         self.assertEquals(data, "a" * 255)
diff --git a/websocket.py b/websocket.py
index 5a33c41..1603e77 100644
--- a/websocket.py
+++ b/websocket.py
@@ -303,11 +303,13 @@ class WebSocket(object):
                 else:
                     bytes.append(b)
             return "".join(bytes)
-        elif 0 < frame_type < 0x80:
+        elif frame_type > 0x80:
             # which frame type is valid?
             length = self._read_length()
             bytes = self._recv_strict(length)
             return bytes
+        else:
+            raise WebSocketException("Invalid frame type")
 
     def _read_length(self):
         length = 0