Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-30 23:00:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2015-10-26 15:18:59 +05:30
parent ae7f6613b4
commit 3beffa6a40
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/srv/web_socket.py
View File

@ -150,9 +150,9 @@ class ReadFrame(object): # {{{
data = conn.recv(min(bytes_left, CHUNK_SIZE))
if not data:
return
data = fast_mask(data, self.mask_buf, self.pos)
else:
data = b''
data = fast_mask(data, self.mask_buf, self.pos)
self.pos += len(data)
frame_finished = self.pos >= self.payload_length
conn.ws_data_received(data, self.opcode, self.frame_starting, frame_finished, self.fin)
@ -330,7 +330,7 @@ class WebSocketConnection(HTTPConnection):
self.frag_decoder.reset()
try:
data = self.frag_decoder.decode(data, final=message_finished)
except ValueError:
except UnicodeDecodeError:
self.frag_decoder.reset()
self.log.error('Client sent undecodeable UTF-8')
return self.websocket_close(INCONSISTENT_DATA, 'Not valid UTF-8')