Merge branch 'binary-frames-closing-handshake' into hybi-10

chadselph · Jul 31, 2011 · a9baf98 · a9baf98
2 parents 288e59f + 846bcdd
commit a9baf98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test_websocket.py b/test_websocket.py
@@ -519,12 +519,12 @@ def test_binaryAndTextSplitted(self):
         self.assertFalse(self.channel.transport.disconnected)
 
 
-    def text_maxBinaryLength(self):
+    def test_maxBinaryLength(self):
         """
         If a binary frame's declared length exceeds MAX_BINARY_LENGTH, the
         connection is dropped.
         """
-        self.decoder.dataReceived("\xff\xff\xff\xff\xff\xff")
+        self.decoder.dataReceived("\xff\xff\xff\xff\xff\x01")
         self.assertTrue(self.channel.transport.disconnected)
 
 

diff --git a/websocket.py b/websocket.py
@@ -730,12 +730,13 @@ def _consumeData_PARSING_LENGTH(self, data):
 
             self._currentFrameLength *= 128
             self._currentFrameLength += length
-            if self._currentFrameLength > self.MAX_BINARY_LENGTH:
-                self.handler.frameLengthExceeded()
 
             current += 1
 
             if not more:
+                if self._currentFrameLength > self.MAX_BINARY_LENGTH:
+                    self.handler.frameLengthExceeded()
+
                 remainingData = data[current:]
                 self._addRemainingData(remainingData)
                 self._state = "PARSING_BINARY_FRAME"