technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Making request state handler calls more consistent.

Browse Source
This commit is contained in:
Max Romanov
2019-09-02 18:27:08 +03:00
parent 1cfd329b3d
commit daadc2e00b
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nxt_h1proto.c
View File

@@ -830,8 +830,7 @@ nxt_h1p_request_body_read(nxt_task_t *task, nxt_http_request_t *r)
ready: ready:
nxt_work_queue_add(&task->thread->engine->fast_work_queue, r->state->ready_handler(task, r, NULL);
r->state->ready_handler, task, r, NULL);
return; return;
@@ -884,8 +883,7 @@ nxt_h1p_conn_request_body_read(nxt_task_t *task, void *obj, void *data)
c->read = NULL; c->read = NULL;
r = h1p->request; r = h1p->request;
nxt_work_queue_add(&engine->fast_work_queue, r->state->ready_handler, r->state->ready_handler(task, r, NULL);
task, r, NULL);
} }
} }

8
src/nxt_h1proto_websocket.c
View File

@@ -417,16 +417,13 @@ nxt_h1p_conn_ws_frame_process(nxt_task_t *task, nxt_conn_t *c,
uint8_t *p, *mask; uint8_t *p, *mask;
uint16_t code; uint16_t code;
nxt_http_request_t *r; nxt_http_request_t *r;
nxt_event_engine_t *engine;
engine = task->thread->engine;
r = h1p->request; r = h1p->request;
c->read = NULL; c->read = NULL;
if (nxt_slow_path(wsh->opcode == NXT_WEBSOCKET_OP_PING)) { if (nxt_slow_path(wsh->opcode == NXT_WEBSOCKET_OP_PING)) {
nxt_work_queue_add(&engine->fast_work_queue, nxt_h1p_conn_ws_pong, nxt_h1p_conn_ws_pong(task, r, NULL);
task, r, NULL);
return; return;
} }
@@ -451,8 +448,7 @@ nxt_h1p_conn_ws_frame_process(nxt_task_t *task, nxt_conn_t *c,
h1p->websocket_closed = 1; h1p->websocket_closed = 1;
} }
nxt_work_queue_add(&engine->fast_work_queue, r->state->ready_handler, r->state->ready_handler(task, r, NULL);
task, r, NULL);
} }