From 32e6f3978e18224bf5d6d7a3847ea25140ec6122 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 17 Feb 2019 22:05:47 -0800 Subject: fixes #882 websocket stream mode doesn't copy received data --- src/supplemental/websocket/websocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 4cecf430..fcd2eeb3 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -843,6 +843,7 @@ ws_read_finish_str(nni_ws *ws) // This eats the entire iov. n = iov->iov_len; } + memcpy(iov->iov_buf, frame->buf, n); iov->iov_buf = ((uint8_t *) iov->iov_buf) + n; iov->iov_len -= n; if (iov->iov_len == 0) { @@ -2038,7 +2039,7 @@ nni_ws_listener_alloc(nng_stream_listener **wslp, const nng_url *url) l->fragsize = WS_DEF_MAXTXFRAME; l->maxframe = WS_DEF_MAXRXFRAME; l->recvmax = WS_DEF_RECVMAX; - l->isstream = false; + l->isstream = true; l->ops.sl_free = ws_listener_free; l->ops.sl_close = ws_listener_close; l->ops.sl_accept = ws_listener_accept; -- cgit v1.2.3-70-g09d2