Klaus Demo nginx / b527aea
Merge of r4267, r4301: Fix of the "keepalive_disable" directive. Maxim Dounin 10 years ago
1 changed file(s) with 9 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all
142142 };
143143
144144
145 static ngx_conf_enum_t ngx_http_core_keepalive_disable[] = {
145 static ngx_conf_bitmask_t ngx_http_core_keepalive_disable[] = {
146146 { ngx_string("none"), NGX_HTTP_KEEPALIVE_DISABLE_NONE },
147147 { ngx_string("msie6"), NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 },
148148 { ngx_string("safari"), NGX_HTTP_KEEPALIVE_DISABLE_SAFARI },
512512 NULL },
513513
514514 { ngx_string("keepalive_disable"),
515 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
516 ngx_conf_set_enum_slot,
515 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
516 ngx_conf_set_bitmask_slot,
517517 NGX_HTTP_LOC_CONF_OFFSET,
518518 offsetof(ngx_http_core_loc_conf_t, keepalive_disable),
519519 &ngx_http_core_keepalive_disable },
32633263 * clcf->auto_redirect = 0;
32643264 * clcf->alias = 0;
32653265 * clcf->gzip_proxied = 0;
3266 * clcf->keepalive_disable = 0;
32663267 */
32673268
32683269 clcf->client_max_body_size = NGX_CONF_UNSET;
32693270 clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
32703271 clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
3271 clcf->keepalive_disable = NGX_CONF_UNSET_UINT;
32723272 clcf->satisfy = NGX_CONF_UNSET_UINT;
32733273 clcf->if_modified_since = NGX_CONF_UNSET_UINT;
32743274 clcf->max_ranges = NGX_CONF_UNSET_UINT;
34713471 ngx_conf_merge_msec_value(conf->client_body_timeout,
34723472 prev->client_body_timeout, 60000);
34733473
3474 ngx_conf_merge_uint_value(conf->keepalive_disable, prev->keepalive_disable,
3475 NGX_HTTP_KEEPALIVE_DISABLE_MSIE6
3476 |NGX_HTTP_KEEPALIVE_DISABLE_SAFARI);
3474 ngx_conf_merge_bitmask_value(conf->keepalive_disable,
3475 prev->keepalive_disable,
3476 (NGX_CONF_BITMASK_SET
3477 |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6
3478 |NGX_HTTP_KEEPALIVE_DISABLE_SAFARI));
34773479 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
34783480 NGX_HTTP_SATISFY_ALL);
34793481 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,