From 340e48b29f49b89bf7dc562533dae1d8d2ec2cc7 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 1 Nov 2011 13:24:50 +0000 Subject: Merging r4132, r4134, r4143, r4183, r4191, r4199: Various fixes related to error messages: *) Removed old warning that suggested to use "server_name_in_redirect off" (now the default) in place of no longer supported "server_name *". *) Fixing directive name in error message if types hash size is not enough. *) Replaced "can not" with "cannot" and "could not" in a bunch of places. Fixed nearby grammar errors. *) Overhauled error messages. --- src/http/ngx_http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/http/ngx_http.c') diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 5ca9fed3c..4f0b79def 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1226,7 +1226,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, #endif /* - * we can not compare whole sockaddr struct's as kernel + * we cannot compare whole sockaddr struct's as kernel * may fill some fields in inherited sockaddr struct's */ @@ -1281,7 +1281,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, if (addr[i].opt.set) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "a duplicate listen options for %s", addr[i].opt.addr); + "duplicate listen options for %s", addr[i].opt.addr); return NGX_ERROR; } -- cgit