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, 7 deletions

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 484919862..31c90bd6f 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -239,7 +239,9 @@ main(int argc, char *const *argv)
         ngx_write_fd(ngx_stderr_fileno, "built by " NGX_COMPILER CRLF,
                      sizeof("built by " NGX_COMPILER CRLF) - 1);
 #endif
-        return 0;
+        if (!ngx_test_config) {
+            return 0;
+        }
     }
 
     if (ngx_test_config) {
diff --git a/src/core/nginx.h b/src/core/nginx.h
index ec230610f..d8be2a77e 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.3.41"
+#define NGINX_VER          "nginx/0.3.42"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 43733aab0..2c694fa27 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -33,7 +33,6 @@ struct ngx_listening_s {
     /* handler of accepted connection */
     ngx_connection_handler_pt   handler;
 
-    void               *ctx;      /* ngx_http_conf_ctx_t, for example */
     void               *servers;  /* array of ngx_http_in_addr_t, for example */
 
     ngx_log_t           log;
@@ -113,10 +112,6 @@ struct ngx_connection_s {
 
     off_t               sent;
 
-    void               *ctx;
-    void               *servers;
-
-
     ngx_log_t          *log;
 
     ngx_pool_t         *pool;