summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMax Romanov <max.romanov@nginx.com>2019-09-02 18:27:08 +0300
committerMax Romanov <max.romanov@nginx.com>2019-09-02 18:27:08 +0300
commitdaadc2e00bc47498513929549bf0364070a1557c (patch)
treef3806322d509428eba7ab2f9a0b0173fbc76fe9e /src
parent1cfd329b3d2746e73432e8007d429e565c6b5fa0 (diff)
downloadunit-daadc2e00bc47498513929549bf0364070a1557c.tar.gz
unit-daadc2e00bc47498513929549bf0364070a1557c.tar.bz2
Making request state handler calls more consistent.
Diffstat (limited to 'src')
-rw-r--r--src/nxt_h1proto.c6
-rw-r--r--src/nxt_h1proto_websocket.c8
2 files changed, 4 insertions, 10 deletions
diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c
index b8f62a88..39be4315 100644
--- a/src/nxt_h1proto.c
+++ b/src/nxt_h1proto.c
@@ -830,8 +830,7 @@ nxt_h1p_request_body_read(nxt_task_t *task, nxt_http_request_t *r)
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;
@@ -884,8 +883,7 @@ nxt_h1p_conn_request_body_read(nxt_task_t *task, void *obj, void *data)
c->read = NULL;
r = h1p->request;
- nxt_work_queue_add(&engine->fast_work_queue, r->state->ready_handler,
- task, r, NULL);
+ r->state->ready_handler(task, r, NULL);
}
}
diff --git a/src/nxt_h1proto_websocket.c b/src/nxt_h1proto_websocket.c
index dd9b6848..13754be0 100644
--- a/src/nxt_h1proto_websocket.c
+++ b/src/nxt_h1proto_websocket.c
@@ -417,16 +417,13 @@ nxt_h1p_conn_ws_frame_process(nxt_task_t *task, nxt_conn_t *c,
uint8_t *p, *mask;
uint16_t code;
nxt_http_request_t *r;
- nxt_event_engine_t *engine;
- engine = task->thread->engine;
r = h1p->request;
c->read = NULL;
if (nxt_slow_path(wsh->opcode == NXT_WEBSOCKET_OP_PING)) {
- nxt_work_queue_add(&engine->fast_work_queue, nxt_h1p_conn_ws_pong,
- task, r, NULL);
+ nxt_h1p_conn_ws_pong(task, r, NULL);
return;
}
@@ -451,8 +448,7 @@ nxt_h1p_conn_ws_frame_process(nxt_task_t *task, nxt_conn_t *c,
h1p->websocket_closed = 1;
}
- nxt_work_queue_add(&engine->fast_work_queue, r->state->ready_handler,
- task, r, NULL);
+ r->state->ready_handler(task, r, NULL);
}