diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-05-19 17:25:22 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-05-19 17:25:22 +0400 |
commit | e31e90b3e10ca2afafccae9a57910133d93b2d37 (patch) | |
tree | 7177a8f48a555733b170bfcad4e9e7072ea8c027 /src/os/unix/ngx_process.c | |
parent | b1a641cafa2ef042035155f68e5f571303853dfc (diff) |
nginx-0.1.32-RELEASE importrelease-0.1.32
*) Bugfix: the arguments were omitted in the redirects, issued by the
"rewrite" directive; the bug had appeared in 0.1.29.
*) Feature: the "if" directive supports the captures in regular
expressions.
*) Feature: the "set" directive supports the variables and the captures
of regular expressions.
*) Feature: the "X-Accel-Redirect" response header line is supported in
proxy and FastCGI mode.
Diffstat (limited to 'src/os/unix/ngx_process.c')
-rw-r--r-- | src/os/unix/ngx_process.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 0562a4644..f9689c9af 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -23,9 +23,9 @@ ngx_int_t ngx_last_process; ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; -ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, - ngx_spawn_proc_pt proc, void *data, - char *name, ngx_int_t respawn) +ngx_pid_t +ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data, + char *name, ngx_int_t respawn) { u_long on; ngx_pid_t pid; @@ -185,14 +185,16 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, } -ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx) +ngx_pid_t +ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx) { return ngx_spawn_process(cycle, ngx_execute_proc, ctx, ctx->name, NGX_PROCESS_DETACHED); } -static void ngx_execute_proc(ngx_cycle_t *cycle, void *data) +static void +ngx_execute_proc(ngx_cycle_t *cycle, void *data) { ngx_exec_ctx_t *ctx = data; @@ -206,7 +208,8 @@ static void ngx_execute_proc(ngx_cycle_t *cycle, void *data) } -void ngx_process_get_status() +void +ngx_process_get_status(void) { int status; char *process; @@ -301,7 +304,8 @@ void ngx_process_get_status() } -void ngx_debug_point() +void +ngx_debug_point(void) { ngx_core_conf_t *ccf; |