nginx-0.3.42-RELEASE importrelease-0.3.42

    *) Feature: the "bind" option of the "listen" directive in IMAP/POP3
       proxy.

    *) Bugfix: if the same capture in the "rewrite" directive was used more
       then once.

    *) Bugfix: the $sent_http_content_type, $sent_http_content_length,
       $sent_http_last_modified, $sent_http_connection,
       $sent_http_keep_alive, and $sent_http_transfer_encoding variables
       were not written to access log.

    *) Bugfix: the $sent_http_cache_control returned value of the single
       "Cache-Control" response header line.

3 files changed, 4 insertions, 11 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;
 
diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
index 9b40c42ed..c51021a6b 100644
--- a/src/event/ngx_event_acceptex.c
+++ b/src/event/ngx_event_acceptex.c
@@ -158,9 +158,6 @@ ngx_event_post_acceptex(ngx_listening_t *ls, ngx_uint_t n)
 
         c->unexpected_eof = 1;
 
-        c->ctx = ls->ctx;
-        c->servers = ls->servers;
-
         c->listening = ls;
 
         rev = c->read;