diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:24:50 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:24:50 +0000 |
| commit | 340e48b29f49b89bf7dc562533dae1d8d2ec2cc7 (patch) | |
| tree | b3a423ebd7d008ca87a0ab512d472376c6a21a78 /src/http/ngx_http.c | |
| parent | 8f86bdbb06393fdd48054c955aca4114f88c4ad7 (diff) | |
| download | nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.tar.gz nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.zip | |
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.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |