aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_cycle.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2006-02-08 15:33:12 +0000
committerIgor Sysoev <igor@sysoev.ru>2006-02-08 15:33:12 +0000
commitffe714403d604b385c89daa7fe5a83860a672a54 (patch)
tree24ce46a2354a79212f91fdbc3d6045ea340c3f12 /src/core/ngx_cycle.h
parent2446d5d6adf67d81883024ffb20ec21d146c0450 (diff)
downloadnginx-ffe714403d604b385c89daa7fe5a83860a672a54.tar.gz
nginx-ffe714403d604b385c89daa7fe5a83860a672a54.zip
nginx-0.3.27-RELEASE importrelease-0.3.27
*) Change: the "variables_hash_max_size" and "variables_hash_bucket_size" directives. *) Feature: the $body_bytes_sent variable can be used not only in the "log_format" directive. *) Feature: the $ssl_protocol and $ssl_cipher variables. *) Feature: the cache line size detection for widespread CPUs at start time. *) Feature: now the "accept_mutex" directive is supported using fcntl(2) on platforms different from i386, amd64, sparc64, and ppc. *) Feature: the "lock_file" directive and the --with-lock-path=PATH autoconfiguration directive. *) Bugfix: if the HTTPS protocol was used in the "proxy_pass" directive then the requests with the body was not transferred.
Diffstat (limited to 'src/core/ngx_cycle.h')
-rw-r--r--src/core/ngx_cycle.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
index b29cf3495..ad92ff2df 100644
--- a/src/core/ngx_cycle.h
+++ b/src/core/ngx_cycle.h
@@ -77,6 +77,7 @@ typedef struct {
ngx_gid_t group;
ngx_str_t working_directory;
+ ngx_str_t lock_file;
ngx_str_t pid;
ngx_str_t oldpid;
@@ -94,11 +95,11 @@ typedef struct {
} ngx_core_tls_t;
-#define ngx_is_init_cycle(old) (old && old->conf_ctx == NULL)
+#define ngx_is_init_cycle(cycle) (cycle->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);
+ngx_int_t ngx_create_pidfile(ngx_str_t *name, ngx_log_t *log);
void ngx_delete_pidfile(ngx_cycle_t *cycle);
void ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user);
ngx_pid_t ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv);