summaryrefslogtreecommitdiff
path: root/src/os/unix/ngx_setproctitle.c
diff options
context:
space:
mode:
authorNGINX team <nginx@nginx.org>2012-04-12 13:05:40 +0000
committerJon Kolb <jon@b0g.us>2012-04-12 13:05:40 +0000
commited2df87c83d3a68ab2a395d4c2549dbe26e86ab0 (patch)
treeff91c69d84d5e4b84a15a12b873c3cb2193fd481 /src/os/unix/ngx_setproctitle.c
parent60a50f7b445d1ac18ea0b1ff140745b6844c6794 (diff)
downloadnginx-1.1.tar.gz
Changes with nginx 1.1.19 12 Apr 2012v1.1.19nginx-1.1
*) Security: specially crafted mp4 file might allow to overwrite memory locations in a worker process if the ngx_http_mp4_module was used, potentially resulting in arbitrary code execution (CVE-2012-2089). Thanks to Matthew Daley. *) Bugfix: nginx/Windows might be terminated abnormally. Thanks to Vincent Lee. *) Bugfix: nginx hogged CPU if all servers in an upstream were marked as "backup". *) Bugfix: the "allow" and "deny" directives might be inherited incorrectly if they were used with IPv6 addresses. *) Bugfix: the "modern_browser" and "ancient_browser" directives might be inherited incorrectly. *) Bugfix: timeouts might be handled incorrectly on Solaris/SPARC. *) Bugfix: in the ngx_http_mp4_module.
Diffstat (limited to 'src/os/unix/ngx_setproctitle.c')
-rw-r--r--src/os/unix/ngx_setproctitle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/unix/ngx_setproctitle.c b/src/os/unix/ngx_setproctitle.c
index a61fe1b94..91afa5191 100644
--- a/src/os/unix/ngx_setproctitle.c
+++ b/src/os/unix/ngx_setproctitle.c
@@ -21,7 +21,7 @@
* 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
+ * You have to use "/usr/ucb/ps -w" instead. Besides, the UCB ps does 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.