From e31e90b3e10ca2afafccae9a57910133d93b2d37 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 19 May 2005 13:25:22 +0000 Subject: nginx-0.1.32-RELEASE import *) 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. --- src/os/unix/ngx_setproctitle.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/os/unix/ngx_setproctitle.h') diff --git a/src/os/unix/ngx_setproctitle.h b/src/os/unix/ngx_setproctitle.h index 107725a0a..22f7e3ea6 100644 --- a/src/os/unix/ngx_setproctitle.h +++ b/src/os/unix/ngx_setproctitle.h @@ -16,30 +16,36 @@ #define ngx_setproctitle setproctitle -#elif !defined NGX_SETPROCTITLE_USES_ENV +#else /* !NGX_HAVE_SETPROCTITLE */ -#define NGX_SETPROCTITLE_USES_ENV 1 +#if !defined NGX_SETPROCTITLE_USES_ENV #if (NGX_SOLARIS) +#define NGX_SETPROCTITLE_USES_ENV 1 #define NGX_SETPROCTITLE_PAD ' ' +ngx_int_t ngx_init_setproctitle(ngx_log_t *log); +void ngx_setproctitle(char *title); + #elif (NGX_LINUX) || (NGX_DARWIN) +#define NGX_SETPROCTITLE_USES_ENV 1 #define NGX_SETPROCTITLE_PAD '\0' -#endif - ngx_int_t ngx_init_setproctitle(ngx_log_t *log); void ngx_setproctitle(char *title); - -#else /* !NGX_SETPROCTITLE_USES_ENV */ +#else #define ngx_init_setproctitle(log) #define ngx_setproctitle(title) -#endif +#endif /* OSes */ + +#endif /* NGX_SETPROCTITLE_USES_ENV */ + +#endif /* NGX_HAVE_SETPROCTITLE */ #endif /* _NGX_SETPROCTITLE_H_INCLUDED_ */ -- cgit