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

Replacing pass with action.

Browse Source
This commit is contained in:
Igor Sysoev
2019-11-14 16:39:48 +03:00
parent 96cd6558ce
commit 14e56fe8c8
6 changed files with 162 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nxt_router.c
View File

@@ -1172,8 +1172,8 @@ nxt_router_conf_error(nxt_task_t *task, nxt_router_temp_conf_t *tmcf)
nxt_queue_each(skcf, &new_socket_confs, nxt_socket_conf_t, link) {
if (skcf->pass != NULL) {
nxt_http_pass_cleanup(task, skcf->pass);
if (skcf->action != NULL) {
nxt_http_action_cleanup(task, skcf->action);
}
} nxt_queue_loop;
@@ -1730,12 +1730,12 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
skcf->router_conf->count++;
if (lscf.pass.length != 0) {
skcf->pass = nxt_http_pass_create(task, tmcf, &lscf.pass);
skcf->action = nxt_http_action_create(task, tmcf, &lscf.pass);
/* COMPATIBILITY: listener application. */
} else if (lscf.application.length > 0) {
skcf->pass = nxt_http_pass_application(task, tmcf,
&lscf.application);
skcf->action = nxt_http_pass_application(task, tmcf,
&lscf.application);
}
}
}
@@ -3071,8 +3071,8 @@ nxt_router_conf_release(nxt_task_t *task, nxt_socket_conf_joint_t *joint)
nxt_thread_spin_unlock(lock);
if (skcf != NULL) {
if (skcf->pass != NULL) {
nxt_http_pass_cleanup(task, skcf->pass);
if (skcf->action != NULL) {
nxt_http_action_cleanup(task, skcf->action);
}
#if (NXT_TLS)