extmod/modwebsocket: Make sure to propagate EOF.

pfalcon · pfalcon · commit 7e9182f3aa16 · 2016-04-08T20:26:54.000+03:00
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c
@@ -68,7 +68,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
     while (1) {
         if (self->to_recv != 0) {
             mp_uint_t out_sz = stream_p->read(self->sock, self->buf + self->buf_pos, self->to_recv, errcode);
-            if (out_sz == MP_STREAM_ERROR) {
+            if (out_sz == 0 || out_sz == MP_STREAM_ERROR) {
                 return out_sz;
             }
             self->buf_pos += out_sz;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int`
`68`	`68`	`while (1) {`
`69`	`69`	`if (self->to_recv != 0) {`
`70`	`70`	`mp_uint_t out_sz = stream_p->read(self->sock, self->buf + self->buf_pos, self->to_recv, errcode);`
`71`		`- if (out_sz == MP_STREAM_ERROR) {`
	`71`	`+ if (out_sz == 0 \|\| out_sz == MP_STREAM_ERROR) {`
`72`	`72`	`return out_sz;`
`73`	`73`	`}`
`74`	`74`	`self->buf_pos += out_sz;`