Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 4266:4c45306936bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix of "keepalive_disable" directive.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 08 Nov 2011 13:48:23 +0000
parents 016352c19049
children d9cffafbe944
comparison
equal deleted inserted replaced
4265:01a7e78ff5a1 4266:4c45306936bb
141 { ngx_string("before"), NGX_HTTP_IMS_BEFORE }, 141 { ngx_string("before"), NGX_HTTP_IMS_BEFORE },
142 { ngx_null_string, 0 } 142 { ngx_null_string, 0 }
143 }; 143 };
144 144
145 145
146 static ngx_conf_enum_t ngx_http_core_keepalive_disable[] = { 146 static ngx_conf_bitmask_t ngx_http_core_keepalive_disable[] = {
147 { ngx_string("none"), NGX_HTTP_KEEPALIVE_DISABLE_NONE }, 147 { ngx_string("none"), NGX_HTTP_KEEPALIVE_DISABLE_NONE },
148 { ngx_string("msie6"), NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 }, 148 { ngx_string("msie6"), NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 },
149 { ngx_string("safari"), NGX_HTTP_KEEPALIVE_DISABLE_SAFARI }, 149 { ngx_string("safari"), NGX_HTTP_KEEPALIVE_DISABLE_SAFARI },
150 { ngx_null_string, 0 } 150 { ngx_null_string, 0 }
151 }; 151 };
511 NGX_HTTP_LOC_CONF_OFFSET, 511 NGX_HTTP_LOC_CONF_OFFSET,
512 offsetof(ngx_http_core_loc_conf_t, keepalive_requests), 512 offsetof(ngx_http_core_loc_conf_t, keepalive_requests),
513 NULL }, 513 NULL },
514 514
515 { ngx_string("keepalive_disable"), 515 { ngx_string("keepalive_disable"),
516 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 516 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
517 ngx_conf_set_enum_slot, 517 ngx_conf_set_bitmask_slot,
518 NGX_HTTP_LOC_CONF_OFFSET, 518 NGX_HTTP_LOC_CONF_OFFSET,
519 offsetof(ngx_http_core_loc_conf_t, keepalive_disable), 519 offsetof(ngx_http_core_loc_conf_t, keepalive_disable),
520 &ngx_http_core_keepalive_disable }, 520 &ngx_http_core_keepalive_disable },
521 521
522 { ngx_string("satisfy"), 522 { ngx_string("satisfy"),
3473 prev->client_body_buffer_size, 3473 prev->client_body_buffer_size,
3474 (size_t) 2 * ngx_pagesize); 3474 (size_t) 2 * ngx_pagesize);
3475 ngx_conf_merge_msec_value(conf->client_body_timeout, 3475 ngx_conf_merge_msec_value(conf->client_body_timeout,
3476 prev->client_body_timeout, 60000); 3476 prev->client_body_timeout, 60000);
3477 3477
3478 ngx_conf_merge_uint_value(conf->keepalive_disable, prev->keepalive_disable, 3478 ngx_conf_merge_bitmask_value(conf->keepalive_disable,
3479 NGX_HTTP_KEEPALIVE_DISABLE_MSIE6 3479 prev->keepalive_disable,
3480 |NGX_HTTP_KEEPALIVE_DISABLE_SAFARI); 3480 (NGX_CONF_BITMASK_SET
3481 |NGX_HTTP_KEEPALIVE_DISABLE_MSIE6
3482 |NGX_HTTP_KEEPALIVE_DISABLE_SAFARI));
3481 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, 3483 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
3482 NGX_HTTP_SATISFY_ALL); 3484 NGX_HTTP_SATISFY_ALL);
3483 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, 3485 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
3484 NGX_HTTP_IMS_EXACT); 3486 NGX_HTTP_IMS_EXACT);
3485 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges, 3487 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges,