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

Fix of "keepalive_disable" directive.

Browse source
This commit is contained in:
Igor Sysoev 2011-11-08 13:48:23 +00:00
parent 2263971f60
commit a1f95cd5d6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/http/ngx_http_core_module.c
View file

@ -143,7 +143,7 @@ static ngx_conf_enum_t ngx_http_core_if_modified_since[] = {
}; };
static ngx_conf_enum_t ngx_http_core_keepalive_disable[] = { static ngx_conf_bitmask_t ngx_http_core_keepalive_disable[] = {
{ ngx_string("none"), NGX_HTTP_KEEPALIVE_DISABLE_NONE }, { ngx_string("none"), NGX_HTTP_KEEPALIVE_DISABLE_NONE },
{ ngx_string("msie6"), NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 }, { ngx_string("msie6"), NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 },
{ ngx_string("safari"), NGX_HTTP_KEEPALIVE_DISABLE_SAFARI }, { ngx_string("safari"), NGX_HTTP_KEEPALIVE_DISABLE_SAFARI },
@ -513,8 +513,8 @@ static ngx_command_t ngx_http_core_commands[] = {
NULL }, NULL },
{ ngx_string("keepalive_disable"), { ngx_string("keepalive_disable"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
ngx_conf_set_enum_slot, ngx_conf_set_bitmask_slot,
NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, keepalive_disable), offsetof(ngx_http_core_loc_conf_t, keepalive_disable),
&ngx_http_core_keepalive_disable }, &ngx_http_core_keepalive_disable },
@ -3475,9 +3475,11 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_msec_value(conf->client_body_timeout, ngx_conf_merge_msec_value(conf->client_body_timeout,
prev->client_body_timeout, 60000); prev->client_body_timeout, 60000);
ngx_conf_merge_uint_value(conf->keepalive_disable, prev->keepalive_disable, ngx_conf_merge_bitmask_value(conf->keepalive_disable,
NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 prev->keepalive_disable,
|NGX_HTTP_KEEPALIVE_DISABLE_SAFARI); (NGX_CONF_BITMASK_SET
|NGX_HTTP_KEEPALIVE_DISABLE_MSIE6
|NGX_HTTP_KEEPALIVE_DISABLE_SAFARI));
ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
NGX_HTTP_SATISFY_ALL); NGX_HTTP_SATISFY_ALL);
ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,