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

Core: removed post_accept_timeout.

Browse Source 
Keeping post_accept_timeout in ngx_listening_t is no longer needed since
we've switched to 1 second timeout for deferred accept in 5541:fdb67cfc957d.

Further, using it in HTTP code can result in client_header_timeout being
used from an incorrect server block, notably if address-specific virtual
servers are used along with a wildcard listening socket, or if we've switched
to a different server block based on SNI in SSL handshake.
This commit is contained in:
Maxim Dounin 2021-01-19 20:32:00 +03:00
parent d2c0b9a6c7
commit 2ec8fac2d6
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_connection.h
View File

@ -45,8 +45,6 @@ struct ngx_listening_s {
size_t pool_size; size_t pool_size;
/* should be here because of the AcceptEx() preread */ /* should be here because of the AcceptEx() preread */
size_t post_accept_buffer_size; size_t post_accept_buffer_size;
/* should be here because of the deferred accept */
ngx_msec_t post_accept_timeout;
ngx_listening_t *previous; ngx_listening_t *previous;
ngx_connection_t *connection; ngx_connection_t *connection;

1
src/http/ngx_http.c
View File

@ -1714,7 +1714,6 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr)
cscf = addr->default_server; cscf = addr->default_server;
ls->pool_size = cscf->connection_pool_size; ls->pool_size = cscf->connection_pool_size;
ls->post_accept_timeout = cscf->client_header_timeout;
clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index]; clcf = cscf->ctx->loc_conf[ngx_http_core_module.ctx_index];

34
src/http/ngx_http_request.c
View File

@ -206,16 +206,17 @@ ngx_http_header_t ngx_http_headers_in[] = {
void void
ngx_http_init_connection(ngx_connection_t *c) ngx_http_init_connection(ngx_connection_t *c)
{ {
ngx_uint_t i; ngx_uint_t i;
ngx_event_t *rev; ngx_event_t *rev;
struct sockaddr_in *sin; struct sockaddr_in *sin;
ngx_http_port_t *port; ngx_http_port_t *port;
ngx_http_in_addr_t *addr; ngx_http_in_addr_t *addr;
ngx_http_log_ctx_t *ctx; ngx_http_log_ctx_t *ctx;
ngx_http_connection_t *hc; ngx_http_connection_t *hc;
ngx_http_core_srv_conf_t *cscf;
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;
ngx_http_in6_addr_t *addr6; ngx_http_in6_addr_t *addr6;
#endif #endif
hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t)); hc = ngx_pcalloc(c->pool, sizeof(ngx_http_connection_t));
@ -361,7 +362,9 @@ ngx_http_init_connection(ngx_connection_t *c)
return; return;
} }
ngx_add_timer(rev, c->listening->post_accept_timeout); cscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_core_module);
ngx_add_timer(rev, cscf->client_header_timeout);
ngx_reusable_connection(c, 1); ngx_reusable_connection(c, 1);
if (ngx_handle_read_event(rev, 0) != NGX_OK) { if (ngx_handle_read_event(rev, 0) != NGX_OK) {
@ -431,7 +434,7 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
if (n == NGX_AGAIN) { if (n == NGX_AGAIN) {
if (!rev->timer_set) { if (!rev->timer_set) {
ngx_add_timer(rev, c->listening->post_accept_timeout); ngx_add_timer(rev, cscf->client_header_timeout);
ngx_reusable_connection(c, 1); ngx_reusable_connection(c, 1);
} }
@ -649,6 +652,7 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
ngx_http_connection_t *hc; ngx_http_connection_t *hc;
ngx_http_ssl_srv_conf_t *sscf; ngx_http_ssl_srv_conf_t *sscf;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
ngx_http_core_srv_conf_t *cscf;
c = rev->data; c = rev->data;
hc = c->data; hc = c->data;
@ -680,7 +684,9 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
rev->ready = 0; rev->ready = 0;
if (!rev->timer_set) { if (!rev->timer_set) {
ngx_add_timer(rev, c->listening->post_accept_timeout); cscf = ngx_http_get_module_srv_conf(hc->conf_ctx,
ngx_http_core_module);
ngx_add_timer(rev, cscf->client_header_timeout);
ngx_reusable_connection(c, 1); ngx_reusable_connection(c, 1);
} }
@ -755,7 +761,9 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
if (rc == NGX_AGAIN) { if (rc == NGX_AGAIN) {
if (!rev->timer_set) { if (!rev->timer_set) {
ngx_add_timer(rev, c->listening->post_accept_timeout); cscf = ngx_http_get_module_srv_conf(hc->conf_ctx,
ngx_http_core_module);
ngx_add_timer(rev, cscf->client_header_timeout);
} }
c->ssl->handler = ngx_http_ssl_handshake_handler; c->ssl->handler = ngx_http_ssl_handshake_handler;