Mercurial > hg > nginx-vendor-current
diff src/core/nginx.c @ 596:6c96fdd2dfc3 NGINX_0_8_50
nginx 0.8.50
*) Feature: the "secure_link", "secure_link_md5", and
"secure_link_expires" directives of the ngx_http_secure_link_module.
*) Feature: the -q switch.
Thanks to Gena Makhomed.
*) Bugfix: worker processes may got caught in an endless loop during
reconfiguration, if a caching was used; the bug had appeared in
0.8.48.
*) Bugfix: in the "gzip_disable" directive.
Thanks to Derrick Petzold.
*) Bugfix: nginx/Windows could not send stop, quit, reopen, and reload
signals to a process run in other session.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Thu, 02 Sep 2010 00:00:00 +0400 |
| parents | 8246d8a2c2be |
| children | be70f83b184f |
line wrap: on
line diff
--- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -212,7 +212,7 @@ main(int argc, char *const *argv) if (ngx_show_help) { ngx_log_stderr(0, - "Usage: nginx [-?hvVt] [-s signal] [-c filename] " + "Usage: nginx [-?hvVtq] [-s signal] [-c filename] " "[-p prefix] [-g directives]" CRLF CRLF "Options:" CRLF " -?,-h : this help" CRLF @@ -220,6 +220,8 @@ main(int argc, char *const *argv) " -V : show version and configure options then exit" CRLF " -t : test configuration and exit" CRLF + " -q : suppress non-error messages " + "during configuration testing" CRLF " -s signal : send signal to a master process: " "stop, quit, reopen, reload" CRLF #ifdef NGX_PREFIX @@ -332,8 +334,11 @@ main(int argc, char *const *argv) } if (ngx_test_config) { - ngx_log_stderr(0, "configuration file %s test is successful", - cycle->conf_file.data); + if (!ngx_quiet_mode) { + ngx_log_stderr(0, "configuration file %s test is successful", + cycle->conf_file.data); + } + return 0; } @@ -685,6 +690,10 @@ ngx_get_options(int argc, char *const *a ngx_test_config = 1; break; + case 'q': + ngx_quiet_mode = 1; + break; + case 'p': if (*p) { ngx_prefix = p;