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_upstream.c | |
| parent | 8f86bdbb06393fdd48054c955aca4114f88c4ad7 (diff) | |
| download | nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.tar.gz nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.tar.bz2 | |
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_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 29432dc14..6d184b441 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -987,7 +987,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, if (!u->cacheable && u->peer.connection) { ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, - "kevent() reported that client closed prematurely " + "kevent() reported that client prematurely closed " "connection, so upstream connection is closed too"); ngx_http_upstream_finalize_request(r, u, NGX_HTTP_CLIENT_CLOSED_REQUEST); @@ -995,8 +995,8 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, } ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, - "kevent() reported that client closed " - "prematurely connection"); + "kevent() reported that client prematurely closed " + "connection"); if (u->peer.connection == NULL) { ngx_http_upstream_finalize_request(r, u, @@ -1050,7 +1050,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, if (!u->cacheable && u->peer.connection) { ngx_log_error(NGX_LOG_INFO, ev->log, err, - "client closed prematurely connection, " + "client prematurely closed connection, " "so upstream connection is closed too"); ngx_http_upstream_finalize_request(r, u, NGX_HTTP_CLIENT_CLOSED_REQUEST); @@ -1058,7 +1058,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, } ngx_log_error(NGX_LOG_INFO, ev->log, err, - "client closed prematurely connection"); + "client prematurely closed connection"); if (u->peer.connection == NULL) { ngx_http_upstream_finalize_request(r, u, |