Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 4246:d3568507db51 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 13:24:50 +0000
parents 2d062c031fff
children 2fad4d19ea4b
comparison
equal deleted inserted replaced
4245:8d39230df833 4246:d3568507db51
985 ev->error = 1; 985 ev->error = 1;
986 } 986 }
987 987
988 if (!u->cacheable && u->peer.connection) { 988 if (!u->cacheable && u->peer.connection) {
989 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, 989 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,
990 "kevent() reported that client closed prematurely " 990 "kevent() reported that client prematurely closed "
991 "connection, so upstream connection is closed too"); 991 "connection, so upstream connection is closed too");
992 ngx_http_upstream_finalize_request(r, u, 992 ngx_http_upstream_finalize_request(r, u,
993 NGX_HTTP_CLIENT_CLOSED_REQUEST); 993 NGX_HTTP_CLIENT_CLOSED_REQUEST);
994 return; 994 return;
995 } 995 }
996 996
997 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, 997 ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,
998 "kevent() reported that client closed " 998 "kevent() reported that client prematurely closed "
999 "prematurely connection"); 999 "connection");
1000 1000
1001 if (u->peer.connection == NULL) { 1001 if (u->peer.connection == NULL) {
1002 ngx_http_upstream_finalize_request(r, u, 1002 ngx_http_upstream_finalize_request(r, u,
1003 NGX_HTTP_CLIENT_CLOSED_REQUEST); 1003 NGX_HTTP_CLIENT_CLOSED_REQUEST);
1004 } 1004 }
1048 ev->eof = 1; 1048 ev->eof = 1;
1049 c->error = 1; 1049 c->error = 1;
1050 1050
1051 if (!u->cacheable && u->peer.connection) { 1051 if (!u->cacheable && u->peer.connection) {
1052 ngx_log_error(NGX_LOG_INFO, ev->log, err, 1052 ngx_log_error(NGX_LOG_INFO, ev->log, err,
1053 "client closed prematurely connection, " 1053 "client prematurely closed connection, "
1054 "so upstream connection is closed too"); 1054 "so upstream connection is closed too");
1055 ngx_http_upstream_finalize_request(r, u, 1055 ngx_http_upstream_finalize_request(r, u,
1056 NGX_HTTP_CLIENT_CLOSED_REQUEST); 1056 NGX_HTTP_CLIENT_CLOSED_REQUEST);
1057 return; 1057 return;
1058 } 1058 }
1059 1059
1060 ngx_log_error(NGX_LOG_INFO, ev->log, err, 1060 ngx_log_error(NGX_LOG_INFO, ev->log, err,
1061 "client closed prematurely connection"); 1061 "client prematurely closed connection");
1062 1062
1063 if (u->peer.connection == NULL) { 1063 if (u->peer.connection == NULL) {
1064 ngx_http_upstream_finalize_request(r, u, 1064 ngx_http_upstream_finalize_request(r, u,
1065 NGX_HTTP_CLIENT_CLOSED_REQUEST); 1065 NGX_HTTP_CLIENT_CLOSED_REQUEST);
1066 } 1066 }