nginx-0.2.0-RELEASE importrelease-0.2.0

    *) The pid-file names used during online upgrade was changed and now is
       not required a manual rename operation. The old master process adds
       the ".oldbin" suffix to its pid-file and executes a new binary file.
       The new master process creates usual pid-file without the ".newbin"
       suffix. If the master process exits, then old master process renames
       back its pid-file with the ".oldbin" suffix to the pid-file without
       suffix.

    *) Change: the "worker_connections" directive, new name of the
       "connections" directive; now the directive specifies maximum number
       of connections, but not maximum socket descriptor number.

    *) Feature: SSL supports the session cache inside one worker process.

    *) Feature: the "satisfy_any" directive.

    *) Change: the ngx_http_access_module and ngx_http_auth_basic_module do
       not run for subrequests.

    *) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending"
       directives.

    *) Bugfix: if all backend using in load-balancing failed after one
       error, then nginx did not try do connect to them during 60 seconds.

    *) Bugfix: in IMAP/POP3 command argument parsing.
       Thanks to Rob Mueller.

    *) Bugfix: errors while using SSL in IMAP/POP3 proxy.

    *) Bugfix: errors while using SSI and gzipping.

    *) Bugfix: the "Expires" and "Cache-Control" header lines were omitted
       from the 304 responses.
       Thanks to Alexandr Kukushkin.

1 files changed, 13 insertions, 4 deletions

diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index 6ed753a93..bf1d43092 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -28,14 +28,20 @@ struct ngx_cycle_s {
     ngx_log_t                *log;
     ngx_log_t                *new_log;
 
+    ngx_connection_t        **files;
+    ngx_connection_t         *free_connections;
+    ngx_uint_t                free_connection_n;
+
     ngx_array_t               listening;
     ngx_array_t               pathes;
     ngx_list_t                open_files;
 
     ngx_uint_t                connection_n;
-    ngx_connection_t         *connections;
-    ngx_event_t              *read_events;
-    ngx_event_t              *write_events;
+    ngx_uint_t                files_n;
+
+    ngx_connection_t         *connections0;
+    ngx_event_t              *read_events0;
+    ngx_event_t              *write_events0;
 
     ngx_cycle_t              *old_cycle;
 
@@ -51,6 +57,9 @@ typedef struct {
      ngx_int_t                worker_processes;
      ngx_int_t                debug_points;
 
+     ngx_int_t                rlimit_nofile;
+     ngx_int_t                rlimit_sigpending;
+
      int                      priority;
 
      char                    *username;
@@ -60,7 +69,7 @@ typedef struct {
      ngx_str_t                working_directory;
 
      ngx_str_t                pid;
-     ngx_str_t                newpid;
+     ngx_str_t                oldpid;
 
 #if (NGX_THREADS)
      ngx_int_t                worker_threads;