Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lingering_close "off|on|always"

Browse source 
patch by Maxim Dounin
This commit is contained in:
Igor Sysoev 2011-08-01 13:26:55 +00:00
parent b462160df5
commit ed02960ae0
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/http/ngx_http_core_module.c
View file

@ -126,6 +126,14 @@ static ngx_conf_enum_t ngx_http_core_satisfy[] = {
};
static ngx_conf_enum_t ngx_http_core_lingering_close[] = {
{ ngx_string("off"), NGX_HTTP_LINGERING_OFF },
{ ngx_string("on"), NGX_HTTP_LINGERING_ON },
{ ngx_string("always"), NGX_HTTP_LINGERING_ALWAYS },
{ ngx_null_string, 0 }
};
static ngx_conf_enum_t ngx_http_core_if_modified_since[] = {
{ ngx_string("off"), NGX_HTTP_IMS_OFF },
{ ngx_string("exact"), NGX_HTTP_IMS_EXACT },
@ -531,6 +539,13 @@ static ngx_command_t ngx_http_core_commands[] = {
0,
NULL },
{ ngx_string("lingering_close"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, lingering_close),
&ngx_http_core_lingering_close },
{ ngx_string("lingering_time"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
@ -3250,6 +3265,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
clcf->keepalive_header = NGX_CONF_UNSET;
clcf->keepalive_requests = NGX_CONF_UNSET_UINT;
clcf->lingering_close = NGX_CONF_UNSET_UINT;
clcf->lingering_time = NGX_CONF_UNSET_MSEC;
clcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
clcf->resolver_timeout = NGX_CONF_UNSET_MSEC;
@ -3466,6 +3482,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
prev->keepalive_header, 0);
ngx_conf_merge_uint_value(conf->keepalive_requests,
prev->keepalive_requests, 100);
ngx_conf_merge_msec_value(conf->lingering_close,
prev->lingering_close, NGX_HTTP_LINGERING_ON);
ngx_conf_merge_msec_value(conf->lingering_time,
prev->lingering_time, 30000);
ngx_conf_merge_msec_value(conf->lingering_timeout,

6
src/http/ngx_http_core_module.h
View file

@ -33,6 +33,11 @@
#define NGX_HTTP_SATISFY_ANY 1
#define NGX_HTTP_LINGERING_OFF 0
#define NGX_HTTP_LINGERING_ON 1
#define NGX_HTTP_LINGERING_ALWAYS 2
#define NGX_HTTP_IMS_OFF 0
#define NGX_HTTP_IMS_EXACT 1
#define NGX_HTTP_IMS_BEFORE 2
@ -356,6 +361,7 @@ struct ngx_http_core_loc_conf_s {
ngx_uint_t keepalive_requests; /* keepalive_requests */
ngx_uint_t keepalive_disable; /* keepalive_disable */
ngx_uint_t satisfy; /* satisfy */
ngx_uint_t lingering_close; /* lingering_close */
ngx_uint_t if_modified_since; /* if_modified_since */
ngx_uint_t client_body_in_file_only; /* client_body_in_file_only */

10
src/http/ngx_http_request.c
View file

@ -2142,11 +2142,13 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
{
ngx_http_set_keepalive(r);
return;
}
} else if (clcf->lingering_timeout > 0
&& (r->lingering_close
|| r->header_in->pos < r->header_in->last
|| r->connection->read->ready))
if (clcf->lingering_close == NGX_HTTP_LINGERING_ALWAYS
|| (clcf->lingering_close == NGX_HTTP_LINGERING_ON
&& (r->lingering_close
|| r->header_in->pos < r->header_in->last
|| r->connection->read->ready)))
{
ngx_http_set_lingering_close(r);
return;