From d039a2e193c9172e4f415b9304222e81804a69d0 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 22 Feb 2005 14:40:13 +0000 Subject: nginx-0.1.21-RELEASE import *) Bugfix: the ngx_http_stub_status_module showed incorrect statistics if "rtsig" method was used or if several worker process ran on SMP. *) Bugfix: nginx could not be built by the icc compiler on Linux or if the zlib-1.2.x library was building from sources. *) Bugfix: nginx could not be built on NetBSD 2.0. --- src/os/unix/ngx_setproctitle.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/os/unix/ngx_setproctitle.c') diff --git a/src/os/unix/ngx_setproctitle.c b/src/os/unix/ngx_setproctitle.c index 2e41108b5..6c95cdf4e 100644 --- a/src/os/unix/ngx_setproctitle.c +++ b/src/os/unix/ngx_setproctitle.c @@ -30,9 +30,10 @@ extern char **environ; static char *ngx_os_argv_last; -ngx_int_t ngx_init_setproctitle(ngx_log_t *log) +ngx_int_t +ngx_init_setproctitle(ngx_log_t *log) { - char *p; + u_char *p; size_t size; ngx_uint_t i; @@ -60,8 +61,8 @@ ngx_int_t ngx_init_setproctitle(ngx_log_t *log) size = ngx_strlen(environ[i]) + 1; ngx_os_argv_last = environ[i] + size; - ngx_cpystrn(p, environ[i], size); - environ[i] = p; + ngx_cpystrn(p, (u_char *) environ[i], size); + environ[i] = (char *) p; p += size; } } @@ -72,7 +73,8 @@ ngx_int_t ngx_init_setproctitle(ngx_log_t *log) } -void ngx_setproctitle(char *title) +void +ngx_setproctitle(char *title) { u_char *p; @@ -131,13 +133,16 @@ void ngx_setproctitle(char *title) #elif !defined(ngx_setproctitle) -ngx_int_t ngx_init_setproctitle(ngx_log_t *log) +ngx_int_t +ngx_init_setproctitle(ngx_log_t *log) { return NGX_OK; } -void ngx_setproctitle(char *title) +void +ngx_setproctitle(char *title) { + return; } #endif -- cgit v1.2.3