mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-05 06:19:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: keepalive flag.

Browse Source 
This patch introduces r->upstream->keepalive flag, which is set by protocol
handlers if connection to upstream is in good state and can be kept alive.
This commit is contained in:
Maxim Dounin 2011-09-15 19:03:15 +00:00
parent a746bab7c1
commit 2d6be3fe93
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http/ngx_http_upstream.c
View File

@ -1297,6 +1297,8 @@ ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u)
return NGX_ERROR; return NGX_ERROR;
} }
u->keepalive = 0;
ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t)); ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t));
u->headers_in.content_length_n = -1; u->headers_in.content_length_n = -1;
@ -2006,6 +2008,11 @@ ngx_http_upstream_process_body_in_memory(ngx_http_request_t *r,
} }
} }
if (u->length == 0) {
ngx_http_upstream_finalize_request(r, u, 0);
return;
}
if (ngx_handle_read_event(rev, 0) != NGX_OK) { if (ngx_handle_read_event(rev, 0) != NGX_OK) {
ngx_http_upstream_finalize_request(r, u, NGX_ERROR); ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return; return;
@ -2126,7 +2133,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
return; return;
} }
if (u->peer.connection->read->ready) { if (u->peer.connection->read->ready || u->length == 0) {
ngx_http_upstream_process_non_buffered_upstream(r, u); ngx_http_upstream_process_non_buffered_upstream(r, u);
} }
} }

1
src/http/ngx_http_upstream.h
View File

@ -308,6 +308,7 @@ struct ngx_http_upstream_s {
#endif #endif
unsigned buffering:1; unsigned buffering:1;
unsigned keepalive:1;
unsigned request_sent:1; unsigned request_sent:1;
unsigned header_sent:1; unsigned header_sent:1;