Commit 4f35368b4d929587724bec4da1d2dd7ad5a5239a - nginx

merge r2889: keepalive_requests Igor Sysoev 13 years ago

4 changed file(s) with 22 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all

-0

src/core/ngx_connection.h less more

133	133
134	134	ngx_atomic_uint_t number;
135	135
	136	ngx_uint_t requests;
	137
136	138	unsigned buffered:8;
137	139
138	140	unsigned log_error:3; /* ngx_connection_log_error_e */

+17

-2

src/http/ngx_http_core_module.c less more

425	425	0,
426	426	NULL },
427	427
	428	{ ngx_string("keepalive_requests"),
	429	NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
	430	ngx_conf_set_num_slot,
	431	NGX_HTTP_LOC_CONF_OFFSET,
	432	offsetof(ngx_http_core_loc_conf_t, keepalive_requests),
	433	NULL },
	434
428	435	{ ngx_string("satisfy"),
429	436	NGX_HTTP_MAIN_CONF\|NGX_HTTP_SRV_CONF\|NGX_HTTP_LOC_CONF\|NGX_CONF_TAKE1,
430	437	ngx_conf_set_enum_slot,

1293	1300	r->request_body_file_log_level = NGX_LOG_WARN;
1294	1301	}
1295	1302
1296		if (r->keepalive && clcf->keepalive_timeout == 0) {
1297		r->keepalive = 0;
	1303	if (r->keepalive) {
	1304	if (clcf->keepalive_timeout == 0) {
	1305	r->keepalive = 0;
	1306
	1307	} else if (r->connection->requests >= clcf->keepalive_requests) {
	1308	r->keepalive = 0;
	1309	}
1298	1310	}
1299	1311
1300	1312	if (!clcf->tcp_nopush) {

2908	2920	lcf->limit_rate = NGX_CONF_UNSET_SIZE;
2909	2921	lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
2910	2922	lcf->keepalive_header = NGX_CONF_UNSET;
	2923	lcf->keepalive_requests = NGX_CONF_UNSET_UINT;
2911	2924	lcf->lingering_time = NGX_CONF_UNSET_MSEC;
2912	2925	lcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
2913	2926	lcf->resolver_timeout = NGX_CONF_UNSET_MSEC;

3102	3115	prev->keepalive_timeout, 75000);
3103	3116	ngx_conf_merge_sec_value(conf->keepalive_header,
3104	3117	prev->keepalive_header, 0);
	3118	ngx_conf_merge_uint_value(conf->keepalive_requests,
	3119	prev->keepalive_requests, 100);
3105	3120	ngx_conf_merge_msec_value(conf->lingering_time,
3106	3121	prev->lingering_time, 30000);
3107	3122	ngx_conf_merge_msec_value(conf->lingering_timeout,

-0

src/http/ngx_http_core_module.h less more

306	306
307	307	time_t keepalive_header; /* keepalive_timeout */
308	308
	309	ngx_uint_t keepalive_requests; /* keepalive_requests */
309	310	ngx_uint_t satisfy; /* satisfy */
310	311	ngx_uint_t if_modified_since; /* if_modified_since */
311	312

-0

src/http/ngx_http_request.c less more