IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-23 07:33:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: fixed EOF handling in unbuffered and upgraded modes.

Browse Source 
With level-triggered event methods it is important to specify
the NGX_CLOSE_EVENT flag to ngx_handle_read_event(), otherwise
the event won't be removed, resulting in CPU hog.

Reported by Patrick Wollgast.
This commit is contained in:
Maxim Dounin 2019-07-18 18:27:52 +03:00
parent 36dfa020f2
commit 20c8c4fe35
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/http/ngx_http_upstream.c
View File

@ -3334,6 +3334,7 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
size_t size; size_t size;
ssize_t n; ssize_t n;
ngx_buf_t *b; ngx_buf_t *b;
ngx_uint_t flags;
ngx_connection_t *c, *downstream, *upstream, *dst, *src; ngx_connection_t *c, *downstream, *upstream, *dst, *src;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
@ -3472,7 +3473,14 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
ngx_del_timer(upstream->write); ngx_del_timer(upstream->write);
} }
if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) { if (upstream->read->eof || upstream->read->error) {
flags = NGX_CLOSE_EVENT;
} else {
flags = 0;
}
if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) {
ngx_http_upstream_finalize_request(r, u, NGX_ERROR); ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return; return;
} }
@ -3491,7 +3499,14 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
return; return;
} }
if (ngx_handle_read_event(downstream->read, 0) != NGX_OK) { if (downstream->read->eof || downstream->read->error) {
flags = NGX_CLOSE_EVENT;
} else {
flags = 0;
}
if (ngx_handle_read_event(downstream->read, flags) != NGX_OK) {
ngx_http_upstream_finalize_request(r, u, NGX_ERROR); ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return; return;
} }
@ -3563,6 +3578,7 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
ssize_t n; ssize_t n;
ngx_buf_t *b; ngx_buf_t *b;
ngx_int_t rc; ngx_int_t rc;
ngx_uint_t flags;
ngx_connection_t *downstream, *upstream; ngx_connection_t *downstream, *upstream;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
@ -3666,7 +3682,14 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
ngx_del_timer(downstream->write); ngx_del_timer(downstream->write);
} }
if (ngx_handle_read_event(upstream->read, 0) != NGX_OK) { if (upstream->read->eof || upstream->read->error) {
flags = NGX_CLOSE_EVENT;
} else {
flags = 0;
}
if (ngx_handle_read_event(upstream->read, flags) != NGX_OK) {
ngx_http_upstream_finalize_request(r, u, NGX_ERROR); ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return; return;
} }