Mercurial > hg > nginx-vendor-0-7
annotate src/os/unix/ngx_setproctitle.c @ 502:89dc5654117c NGINX_0_7_63
nginx 0.7.63
*) Security: now "/../" are disabled in "Destination" request header
line.
*) Change: minimum supported OpenSSL version is 0.9.7.
*) Change: the "ask" parameter of the "ssl_verify_client" directive was
changed to the "optional" parameter and now it checks a client
certificate if it was offered.
Thanks to Brice Figureau.
*) Feature: now the "-V" switch shows TLS SNI support.
*) Feature: the $ssl_client_verify variable.
Thanks to Brice Figureau.
*) Feature: the "ssl_crl" directive.
Thanks to Brice Figureau.
*) Bugfix: the $ssl_client_cert variable usage corrupted memory; the
bug had appeared in 0.7.7.
Thanks to Sergey Zhuravlev.
*) Feature: now the start cache loader runs in a separate process; this
should improve large caches handling.
*) Feature: now temporary files and permanent storage area may reside
at different file systems.
*) Bugfix: nginx counted incorrectly disk cache size.
*) Change: now directive "gzip_disable msie6" does not disable gzipping
for MSIE 6.0 SV1.
*) Bugfix: nginx always added "Vary: Accept-Encoding" response header
line, if both "gzip_static" and "gzip_vary" were on.
*) Feature: the "proxy" parameter of the "geo" directive.
*) Feature: the ngx_http_geoip_module.
*) Feature: the "limit_rate_after" directive.
Thanks to Ivan Debnar.
*) Feature: the "limit_req_log_level" and "limit_conn_log_level"
directives.
*) Bugfix: now "limit_req" directive conforms to the leaky bucket
algorithm.
Thanks to Maxim Dounin.
*) Bugfix: in ngx_http_limit_req_module.
Thanks to Maxim Dounin.
*) Bugfix: now nginx allows underscores in a request method.
*) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did
not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate",
"X-Accel-Buffering", and "X-Accel-Charset" lines from backend
response header.
Thanks to Maxim Dounin.
*) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend
response header lines; the bug had appeared in 0.7.44.
Thanks to Maxim Dounin.
*) Feature: the "image_filter_transparency" directive.
*) Feature: the "image_filter" directive supports variables for setting
size.
*) Bugfix: in PNG alpha-channel support in the
ngx_http_image_filter_module.
*) Bugfix: in transparency support in the ngx_http_image_filter_module.
*) Feature: now several "perl_modules" directives may be used.
*) Bugfix: ngx_http_perl_module responses did not work in subrequests.
*) Bugfix: nginx sent '\0' in a "Location" response header line on
MKCOL request.
Thanks to Xie Zhenye.
*) Bugfix: an "error_page" directive did not redirect a 413 error; the
bug had appeared in 0.6.10.
*) Bugfix: in memory allocation error handling.
Thanks to Maxim Dounin and Kirill A. Korinskiy.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 00:00:00 +0300 |
parents | 6ae11d59d10e |
children |
rev | line source |
---|---|
2 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 #if (NGX_SETPROCTITLE_USES_ENV) | |
12 | |
13 /* | |
14 * To change the process title in Linux and Solaris we have to set argv[1] | |
15 * to NULL and to copy the title to the same place where the argv[0] points to. | |
16 * However, argv[0] may be too small to hold a new title. Fortunately, Linux | |
17 * and Solaris store argv[] and environ[] one after another. So we should | |
18 * ensure that is the continuous memory and then we allocate the new memory | |
19 * for environ[] and copy it. After this we could use the memory starting | |
20 * from argv[0] for our process title. | |
21 * | |
22 * The Solaris's standard /bin/ps does not show the changed process title. | |
23 * You have to use "/usr/ucb/ps -w" instead. Besides, the UCB ps dos not | |
24 * show a new title if its length less than the origin command line length. | |
25 * To avoid it we append to a new title the origin command line in the | |
26 * parenthesis. | |
27 */ | |
28 | |
29 extern char **environ; | |
30 | |
31 static char *ngx_os_argv_last; | |
32 | |
42 | 33 ngx_int_t |
34 ngx_init_setproctitle(ngx_log_t *log) | |
2 | 35 { |
42 | 36 u_char *p; |
2 | 37 size_t size; |
38 ngx_uint_t i; | |
39 | |
40 size = 0; | |
41 | |
42 for (i = 0; environ[i]; i++) { | |
43 size += ngx_strlen(environ[i]) + 1; | |
44 } | |
45 | |
50 | 46 p = ngx_alloc(size, log); |
47 if (p == NULL) { | |
2 | 48 return NGX_ERROR; |
49 } | |
50 | |
51 ngx_os_argv_last = ngx_os_argv[0]; | |
52 | |
53 for (i = 0; ngx_os_argv[i]; i++) { | |
54 if (ngx_os_argv_last == ngx_os_argv[i]) { | |
55 ngx_os_argv_last = ngx_os_argv[i] + ngx_strlen(ngx_os_argv[i]) + 1; | |
56 } | |
57 } | |
58 | |
59 for (i = 0; environ[i]; i++) { | |
60 if (ngx_os_argv_last == environ[i]) { | |
61 | |
62 size = ngx_strlen(environ[i]) + 1; | |
63 ngx_os_argv_last = environ[i] + size; | |
64 | |
42 | 65 ngx_cpystrn(p, (u_char *) environ[i], size); |
66 environ[i] = (char *) p; | |
2 | 67 p += size; |
68 } | |
69 } | |
70 | |
71 ngx_os_argv_last--; | |
72 | |
73 return NGX_OK; | |
74 } | |
75 | |
76 | |
42 | 77 void |
78 ngx_setproctitle(char *title) | |
2 | 79 { |
80 u_char *p; | |
81 | |
4 | 82 #if (NGX_SOLARIS) |
2 | 83 |
84 ngx_int_t i; | |
85 size_t size; | |
86 | |
87 #endif | |
88 | |
89 ngx_os_argv[1] = NULL; | |
90 | |
56 | 91 p = ngx_cpystrn((u_char *) ngx_os_argv[0], (u_char *) "nginx: ", |
2 | 92 ngx_os_argv_last - ngx_os_argv[0]); |
93 | |
94 p = ngx_cpystrn(p, (u_char *) title, ngx_os_argv_last - (char *) p); | |
95 | |
4 | 96 #if (NGX_SOLARIS) |
2 | 97 |
98 size = 0; | |
99 | |
100 for (i = 0; i < ngx_argc; i++) { | |
101 size += ngx_strlen(ngx_argv[i]) + 1; | |
102 } | |
103 | |
104 if (size > (size_t) ((char *) p - ngx_os_argv[0])) { | |
105 | |
106 /* | |
107 * ngx_setproctitle() is too rare operation so we use | |
108 * the non-optimized copies | |
109 */ | |
110 | |
111 p = ngx_cpystrn(p, (u_char *) " (", ngx_os_argv_last - (char *) p); | |
112 | |
113 for (i = 0; i < ngx_argc; i++) { | |
114 p = ngx_cpystrn(p, (u_char *) ngx_argv[i], | |
115 ngx_os_argv_last - (char *) p); | |
116 p = ngx_cpystrn(p, (u_char *) " ", ngx_os_argv_last - (char *) p); | |
117 } | |
118 | |
119 if (*(p - 1) == ' ') { | |
120 *(p - 1) = ')'; | |
121 } | |
122 } | |
123 | |
124 #endif | |
125 | |
126 if (ngx_os_argv_last - (char *) p) { | |
127 ngx_memset(p, NGX_SETPROCTITLE_PAD, ngx_os_argv_last - (char *) p); | |
128 } | |
129 | |
130 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, | |
131 "setproctitle: \"%s\"", ngx_os_argv[0]); | |
132 } | |
133 | |
58 | 134 #endif /* NGX_SETPROCTITLE_USES_ENV */ |