aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_cycle.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-12-02 18:40:46 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-12-02 18:40:46 +0000
commit42b12b34fa74c15cfb1746d71cde949f3d5807ef (patch)
treec44cd3f35d794e6e2be01d516e72737464f76fff /src/core/ngx_cycle.h
parent4e7b11b02bd42ed284a5f006a13b0635fc33d556 (diff)
downloadnginx-42b12b34fa74c15cfb1746d71cde949f3d5807ef.tar.gz
nginx-42b12b34fa74c15cfb1746d71cde949f3d5807ef.zip
nginx-0.1.11-RELEASE importrelease-0.1.11
*) Feature: the worker_priority directive. *) Change: both tcp_nopush and tcp_nodelay directives affect the transferred response. *) Bugfix: nginx did not call initgroups(). Thanks to Andrew Sitnikov and Andrei Nigmatulin. *) Change: now the ngx_http_autoindex_module shows the file size in the bytes. *) Bugfix: the ngx_http_autoindex_module returned the 500 error if the broken symlink was in a directory. *) Bugfix: the files bigger than 4G could not be transferred using sendfile. *) Bugfix: if the backend was resolved to several backends and there was an error while the response waiting then process may got caught in an endless loop. *) Bugfix: the worker process may exit with the "unknown cycle" message when the /dev/poll method was used. *) Bugfix: "close() channel failed" errors. *) Bugfix: the autodetection of the "nobody" and "nogroup" groups. *) Bugfix: the send_lowat directive did not work on Linux. *) Bugfix: the segmentation fault occurred if there was no events section in configuration. *) Bugfix: nginx could not be built on OpenBSD. *) Bugfix: the double slashes in "://" in the URI were converted to ":/".
Diffstat (limited to 'src/core/ngx_cycle.h')
-rw-r--r--src/core/ngx_cycle.h53
1 files changed, 28 insertions, 25 deletions
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index 2baf82904..face67fe8 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -17,51 +17,54 @@
struct ngx_cycle_s {
- void ****conf_ctx;
- ngx_pool_t *pool;
+ void ****conf_ctx;
+ ngx_pool_t *pool;
- ngx_log_t *log;
- ngx_log_t *new_log;
+ ngx_log_t *log;
+ ngx_log_t *new_log;
- ngx_array_t listening;
- ngx_array_t pathes;
- ngx_list_t open_files;
+ 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 connection_n;
+ ngx_connection_t *connections;
+ ngx_event_t *read_events;
+ ngx_event_t *write_events;
- ngx_cycle_t *old_cycle;
+ ngx_cycle_t *old_cycle;
- ngx_str_t conf_file;
- ngx_str_t root;
+ ngx_str_t conf_file;
+ ngx_str_t root;
};
typedef struct {
- ngx_flag_t daemon;
- ngx_flag_t master;
+ ngx_flag_t daemon;
+ ngx_flag_t master;
- ngx_int_t worker_processes;
- ngx_int_t debug_points;
+ ngx_int_t worker_processes;
+ ngx_int_t debug_points;
- ngx_uid_t user;
- ngx_gid_t group;
+ int priority;
- ngx_str_t pid;
- ngx_str_t newpid;
+ char *username;
+ ngx_uid_t user;
+ ngx_gid_t group;
+
+ ngx_str_t pid;
+ ngx_str_t newpid;
#if (NGX_THREADS)
- ngx_int_t worker_threads;
- size_t thread_stack_size;
+ ngx_int_t worker_threads;
+ size_t thread_stack_size;
#endif
} ngx_core_conf_t;
typedef struct {
- ngx_pool_t *pool; /* pcre's malloc() pool */
+ ngx_pool_t *pool; /* pcre's malloc() pool */
} ngx_core_tls_t;