diff options
| author | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-06-03 23:23:08 +0200 |
|---|---|---|
| committer | Glenn Ruben Bakke <glennbakke@gmail.com> | 2017-06-03 23:23:08 +0200 |
| commit | 227eeb1408cd442e896c33fd82d1d709ee9c95cd (patch) | |
| tree | 7dfd4bf6894d59c299107960c47bace77cf166df /extmod/modwebsocket.c | |
| parent | d83c4fa130692ed9dbdfbe1bb8903da5721e7734 (diff) | |
| parent | a0dbbbebb8c0286e00ae06751b0173cbca4ec801 (diff) | |
Merge remote-tracking branch 'upstream/master' into nrf5_no_sdk
Diffstat (limited to 'extmod/modwebsocket.c')
| -rw-r--r-- | extmod/modwebsocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extmod/modwebsocket.c b/extmod/modwebsocket.c index 8200ea708..9e17d6a6d 100644 --- a/extmod/modwebsocket.c +++ b/extmod/modwebsocket.c @@ -132,7 +132,7 @@ STATIC mp_uint_t websocket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int self->buf_pos = 0; self->to_recv = to_recv; - self->msg_sz = sz; // May be overriden by FRAME_OPT + self->msg_sz = sz; // May be overridden by FRAME_OPT if (to_recv != 0) { self->state = FRAME_OPT; } else { |