summaryrefslogtreecommitdiff
path: root/src/event
diff options
context:
space:
mode:
Diffstat (limited to 'src/event')
-rw-r--r--src/event/ngx_event.c9
-rw-r--r--src/event/ngx_event_accept.c3
2 files changed, 4 insertions, 8 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 7a4d7594e..4fc98e937 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -432,8 +432,10 @@ ngx_event_module_init(ngx_cycle_t *cycle)
ecf = (*cf)[ngx_event_core_module.ctx_index];
- ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
- "using the \"%s\" event method", ecf->name);
+ if (!ngx_test_config) {
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
+ "using the \"%s\" event method", ecf->name);
+ }
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
@@ -738,9 +740,6 @@ ngx_event_process_init(ngx_cycle_t *cycle)
c->listening = &ls[i];
ls[i].connection = c;
- c->ctx = ls[i].ctx;
- c->servers = ls[i].servers;
-
rev = c->read;
rev->log = c->log;
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index ebba8727d..e41f04ae5 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -156,9 +156,6 @@ ngx_event_accept(ngx_event_t *ev)
c->unexpected_eof = 1;
- c->ctx = lc->ctx;
- c->servers = lc->servers;
-
rev = c->read;
wev = c->write;