2004-10-11 23:07:03 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (C) Igor Sysoev
|
2012-01-18 23:07:43 +08:00
|
|
|
* Copyright (C) Nginx, Inc.
|
2004-10-11 23:07:03 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <ngx_config.h>
|
|
|
|
#include <ngx_core.h>
|
|
|
|
|
|
|
|
|
|
|
|
#if (NGX_SETPROCTITLE_USES_ENV)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To change the process title in Linux and Solaris we have to set argv[1]
|
|
|
|
* to NULL and to copy the title to the same place where the argv[0] points to.
|
|
|
|
* However, argv[0] may be too small to hold a new title. Fortunately, Linux
|
|
|
|
* and Solaris store argv[] and environ[] one after another. So we should
|
|
|
|
* ensure that is the continuous memory and then we allocate the new memory
|
|
|
|
* for environ[] and copy it. After this we could use the memory starting
|
|
|
|
* from argv[0] for our process title.
|
|
|
|
*
|
|
|
|
* The Solaris's standard /bin/ps does not show the changed process title.
|
|
|
|
* You have to use "/usr/ucb/ps -w" instead. Besides, the UCB ps dos not
|
|
|
|
* show a new title if its length less than the origin command line length.
|
|
|
|
* To avoid it we append to a new title the origin command line in the
|
|
|
|
* parenthesis.
|
|
|
|
*/
|
|
|
|
|
|
|
|
extern char **environ;
|
|
|
|
|
|
|
|
static char *ngx_os_argv_last;
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
ngx_int_t
|
|
|
|
ngx_init_setproctitle(ngx_log_t *log)
|
2004-10-11 23:07:03 +08:00
|
|
|
{
|
2005-02-22 22:40:13 +08:00
|
|
|
u_char *p;
|
2004-10-11 23:07:03 +08:00
|
|
|
size_t size;
|
|
|
|
ngx_uint_t i;
|
|
|
|
|
|
|
|
size = 0;
|
|
|
|
|
|
|
|
for (i = 0; environ[i]; i++) {
|
|
|
|
size += ngx_strlen(environ[i]) + 1;
|
|
|
|
}
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
p = ngx_alloc(size, log);
|
|
|
|
if (p == NULL) {
|
2004-10-11 23:07:03 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
ngx_os_argv_last = ngx_os_argv[0];
|
|
|
|
|
|
|
|
for (i = 0; ngx_os_argv[i]; i++) {
|
|
|
|
if (ngx_os_argv_last == ngx_os_argv[i]) {
|
|
|
|
ngx_os_argv_last = ngx_os_argv[i] + ngx_strlen(ngx_os_argv[i]) + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; environ[i]; i++) {
|
|
|
|
if (ngx_os_argv_last == environ[i]) {
|
|
|
|
|
|
|
|
size = ngx_strlen(environ[i]) + 1;
|
|
|
|
ngx_os_argv_last = environ[i] + size;
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
ngx_cpystrn(p, (u_char *) environ[i], size);
|
|
|
|
environ[i] = (char *) p;
|
2004-10-11 23:07:03 +08:00
|
|
|
p += size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ngx_os_argv_last--;
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
void
|
|
|
|
ngx_setproctitle(char *title)
|
2004-10-11 23:07:03 +08:00
|
|
|
{
|
|
|
|
u_char *p;
|
|
|
|
|
2004-10-21 23:34:38 +08:00
|
|
|
#if (NGX_SOLARIS)
|
2004-10-11 23:07:03 +08:00
|
|
|
|
|
|
|
ngx_int_t i;
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ngx_os_argv[1] = NULL;
|
|
|
|
|
2005-04-08 23:18:55 +08:00
|
|
|
p = ngx_cpystrn((u_char *) ngx_os_argv[0], (u_char *) "nginx: ",
|
2004-10-11 23:07:03 +08:00
|
|
|
ngx_os_argv_last - ngx_os_argv[0]);
|
|
|
|
|
|
|
|
p = ngx_cpystrn(p, (u_char *) title, ngx_os_argv_last - (char *) p);
|
|
|
|
|
2004-10-21 23:34:38 +08:00
|
|
|
#if (NGX_SOLARIS)
|
2004-10-11 23:07:03 +08:00
|
|
|
|
|
|
|
size = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < ngx_argc; i++) {
|
|
|
|
size += ngx_strlen(ngx_argv[i]) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (size > (size_t) ((char *) p - ngx_os_argv[0])) {
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ngx_setproctitle() is too rare operation so we use
|
|
|
|
* the non-optimized copies
|
|
|
|
*/
|
|
|
|
|
|
|
|
p = ngx_cpystrn(p, (u_char *) " (", ngx_os_argv_last - (char *) p);
|
|
|
|
|
|
|
|
for (i = 0; i < ngx_argc; i++) {
|
|
|
|
p = ngx_cpystrn(p, (u_char *) ngx_argv[i],
|
|
|
|
ngx_os_argv_last - (char *) p);
|
|
|
|
p = ngx_cpystrn(p, (u_char *) " ", ngx_os_argv_last - (char *) p);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*(p - 1) == ' ') {
|
|
|
|
*(p - 1) = ')';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (ngx_os_argv_last - (char *) p) {
|
|
|
|
ngx_memset(p, NGX_SETPROCTITLE_PAD, ngx_os_argv_last - (char *) p);
|
|
|
|
}
|
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
|
|
|
|
"setproctitle: \"%s\"", ngx_os_argv[0]);
|
|
|
|
}
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
#endif /* NGX_SETPROCTITLE_USES_ENV */
|