mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 06:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

get a full response if the response is cacheable or storable even

Browse Source 
a client has closed connection prematurely
This commit is contained in:
Igor Sysoev 2009-04-27 11:20:55 +00:00
parent f1cc457d7f
commit df585ef949
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/http/ngx_http_upstream.c
View File

@ -353,7 +353,9 @@ ngx_http_upstream_init(ngx_http_request_t *r)
u = r->upstream; u = r->upstream;
if (!r->post_action && !u->conf->ignore_client_abort) { u->store = (u->conf->store || u->conf->store_lengths);
if (!u->store && !r->post_action && !u->conf->ignore_client_abort) {
r->read_event_handler = ngx_http_upstream_rd_check_broken_connection; r->read_event_handler = ngx_http_upstream_rd_check_broken_connection;
r->write_event_handler = ngx_http_upstream_wr_check_broken_connection; r->write_event_handler = ngx_http_upstream_wr_check_broken_connection;
} }
@ -439,8 +441,6 @@ ngx_http_upstream_init(ngx_http_request_t *r)
cln->data = r; cln->data = r;
u->cleanup = &cln->handler; u->cleanup = &cln->handler;
u->store = (u->conf->store || u->conf->store_lengths);
if (u->resolved == NULL) { if (u->resolved == NULL) {
uscf = u->conf->upstream; uscf = u->conf->upstream;
@ -779,8 +779,10 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
u = r->upstream; u = r->upstream;
if (c->error) { if (c->error) {
ngx_http_upstream_finalize_request(r, u, if (!u->cacheable) {
NGX_HTTP_CLIENT_CLOSED_REQUEST); ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_CLIENT_CLOSED_REQUEST);
}
return; return;
} }
@ -803,7 +805,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
ev->error = 1; ev->error = 1;
} }
if (!u->cacheable && !u->store && u->peer.connection) { if (!u->cacheable && u->peer.connection) {
ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno, ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,
"kevent() reported that client closed prematurely " "kevent() reported that client closed prematurely "
"connection, so upstream connection is closed too"); "connection, so upstream connection is closed too");
@ -869,7 +871,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
ev->eof = 1; ev->eof = 1;
c->error = 1; c->error = 1;
if (!u->cacheable && !u->store && u->peer.connection) { if (!u->cacheable && u->peer.connection) {
ngx_log_error(NGX_LOG_INFO, ev->log, err, ngx_log_error(NGX_LOG_INFO, ev->log, err,
"client closed prematurely connection, " "client closed prematurely connection, "
"so upstream connection is closed too"); "so upstream connection is closed too");
@ -2486,7 +2488,7 @@ ngx_http_upstream_process_request(ngx_http_request_t *r)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http upstream downstream error"); "http upstream downstream error");
if (!u->cacheable && u->peer.connection) { if (!u->cacheable && !u->store && u->peer.connection) {
ngx_http_upstream_finalize_request(r, u, 0); ngx_http_upstream_finalize_request(r, u, 0);
} }
} }