aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_cycle.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2006-02-01 18:22:15 +0000
committerIgor Sysoev <igor@sysoev.ru>2006-02-01 18:22:15 +0000
commit9e58019dc287493e02543d614c975cc14295a71e (patch)
tree328bccfba6e86794eafc546a7cb7ec8aff007b7f /src/core/ngx_cycle.h
parente8038c0d1a044f2046d5f7adeb1586d17a5bd81a (diff)
downloadnginx-release-0.3.24.tar.gz
nginx-release-0.3.24.zip
nginx-0.3.24-RELEASE importrelease-0.3.24
*) Workaround: for bug in FreeBSD kqueue. *) Bugfix: now a response generated by the "post_action" directive is not transferred to a client. *) Bugfix: the memory leaks were occurring if many log files were used. *) Bugfix: the first "proxy_redirect" directive was working inside one location. *) Bugfix: on 64-bit platforms segmentation fault may occurred on start if the many names were used in the "server_name" directives; the bug had appeared in 0.3.18.
Diffstat (limited to 'src/core/ngx_cycle.h')
-rw-r--r--src/core/ngx_cycle.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index cbf8c7ba1..b29cf3495 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -32,6 +32,10 @@ struct ngx_cycle_s {
ngx_connection_t *free_connections;
ngx_uint_t free_connection_n;
+ ngx_shm_t shm;
+ u_char *shm_last;
+ u_char *shm_end;
+
ngx_array_t listening;
ngx_array_t pathes;
ngx_list_t open_files;
@@ -90,6 +94,9 @@ typedef struct {
} ngx_core_tls_t;
+#define ngx_is_init_cycle(old) (old && old->conf_ctx == NULL)
+
+
ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle);
ngx_int_t ngx_create_pidfile(ngx_cycle_t *cycle, ngx_cycle_t *old_cycle);
void ngx_delete_pidfile(ngx_cycle_t *cycle);