diff options
| author | Andrei Belov <defan@nginx.com> | 2019-11-14 19:29:00 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-11-14 19:29:00 +0300 |
| commit | 7630539c44fcb188bba03a65af34e952a81f2f38 (patch) | |
| tree | 2c80f0cd315cae8079a39ba98ed89e02b5e1931a /src/nxt_h1proto_websocket.c | |
| parent | 70c9f18b6e8b25850bce8eb1edba4d100c3e55d2 (diff) | |
| parent | 0a27f137de776925a24406cf6961c550824c63a0 (diff) | |
| download | unit-7630539c44fcb188bba03a65af34e952a81f2f38.tar.gz unit-7630539c44fcb188bba03a65af34e952a81f2f38.tar.bz2 | |
Merged with the default branch.1.13.0-1
Diffstat (limited to '')
| -rw-r--r-- | src/nxt_h1proto_websocket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nxt_h1proto_websocket.c b/src/nxt_h1proto_websocket.c index 13754be0..c9ff899c 100644 --- a/src/nxt_h1proto_websocket.c +++ b/src/nxt_h1proto_websocket.c @@ -26,7 +26,7 @@ static void nxt_h1p_conn_ws_keepalive_enable(nxt_task_t *task, static void nxt_h1p_conn_ws_frame_process(nxt_task_t *task, nxt_conn_t *c, nxt_h1proto_t *h1p, nxt_websocket_header_t *wsh); static void nxt_h1p_conn_ws_error(nxt_task_t *task, void *obj, void *data); -static ssize_t nxt_h1p_ws_io_read_handler(nxt_conn_t *c); +static ssize_t nxt_h1p_ws_io_read_handler(nxt_task_t *task, nxt_conn_t *c); static void nxt_h1p_conn_ws_timeout(nxt_task_t *task, void *obj, void *data); static void nxt_h1p_conn_ws_frame_payload_read(nxt_task_t *task, void *obj, void *data); @@ -473,7 +473,7 @@ nxt_h1p_conn_ws_error(nxt_task_t *task, void *obj, void *data) static ssize_t -nxt_h1p_ws_io_read_handler(nxt_conn_t *c) +nxt_h1p_ws_io_read_handler(nxt_task_t *task, nxt_conn_t *c) { size_t size; ssize_t n; @@ -697,6 +697,7 @@ nxt_h1p_conn_ws_pong(nxt_task_t *task, void *obj, void *data) for (i = 0; i < payload_len; i++) { while (nxt_buf_mem_used_size(&b->mem) == 0) { next = b->next; + b->next = NULL; nxt_work_queue_add(&task->thread->engine->fast_work_queue, b->completion_handler, task, b, b->parent); |