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

Respect the new behavior of TCP_DEFER_ACCEPT.

Browse Source 
In Linux 2.6.32, TCP_DEFER_ACCEPT was changed to accept connections
after the deferring period is finished without any data available.
(Reading from the socket returns EAGAIN in this case.)

Since in nginx TCP_DEFER_ACCEPT is set to "post_accept_timeout", we
do not need to wait longer if deferred accept returns with no data.
This commit is contained in:
Valentin Bartenev 2013-03-07 17:59:27 +00:00
parent 3e5aaee828
commit 4815b3b2ee
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/http/ngx_http_request.c
View File

@ -416,6 +416,20 @@ ngx_http_wait_request_handler(ngx_event_t *rev)
if (n == NGX_AGAIN) {
#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
if (c->listening->deferred_accept
#if (NGX_HTTP_SSL)
&& c->ssl == NULL
#endif
)
{
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
"client timed out in deferred accept");
ngx_http_close_connection(c);
return;
}
#endif
if (!rev->timer_set) {
ngx_add_timer(rev, c->listening->post_accept_timeout);
}
@ -617,6 +631,15 @@ ngx_http_ssl_handshake(ngx_event_t *rev)
if (n == -1) {
if (err == NGX_EAGAIN) {
#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
if (c->listening->deferred_accept) {
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
"client timed out in deferred accept");
ngx_http_close_connection(c);
return;
}
#endif
if (!rev->timer_set) {
ngx_add_timer(rev, c->listening->post_accept_timeout);
}