merge r2889:
keepalive_requests
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index ac86796..4c41555 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -134,6 +134,8 @@
ngx_atomic_uint_t number;
+ ngx_uint_t requests;
+
unsigned buffered:8;
unsigned log_error:3; /* ngx_connection_log_error_e */
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c312a05..d998358 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -426,6 +426,13 @@
0,
NULL },
+ { ngx_string("keepalive_requests"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ NGX_HTTP_LOC_CONF_OFFSET,
+ offsetof(ngx_http_core_loc_conf_t, keepalive_requests),
+ NULL },
+
{ ngx_string("satisfy"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot,
@@ -1294,8 +1301,13 @@
r->request_body_file_log_level = NGX_LOG_WARN;
}
- if (r->keepalive && clcf->keepalive_timeout == 0) {
- r->keepalive = 0;
+ if (r->keepalive) {
+ if (clcf->keepalive_timeout == 0) {
+ r->keepalive = 0;
+
+ } else if (r->connection->requests >= clcf->keepalive_requests) {
+ r->keepalive = 0;
+ }
}
if (!clcf->tcp_nopush) {
@@ -2909,6 +2921,7 @@
lcf->limit_rate = NGX_CONF_UNSET_SIZE;
lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
lcf->keepalive_header = NGX_CONF_UNSET;
+ lcf->keepalive_requests = NGX_CONF_UNSET_UINT;
lcf->lingering_time = NGX_CONF_UNSET_MSEC;
lcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
lcf->resolver_timeout = NGX_CONF_UNSET_MSEC;
@@ -3103,6 +3116,8 @@
prev->keepalive_timeout, 75000);
ngx_conf_merge_sec_value(conf->keepalive_header,
prev->keepalive_header, 0);
+ ngx_conf_merge_uint_value(conf->keepalive_requests,
+ prev->keepalive_requests, 100);
ngx_conf_merge_msec_value(conf->lingering_time,
prev->lingering_time, 30000);
ngx_conf_merge_msec_value(conf->lingering_timeout,
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 76d4215..23b5144 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -307,6 +307,7 @@
time_t keepalive_header; /* keepalive_timeout */
+ ngx_uint_t keepalive_requests; /* keepalive_requests */
ngx_uint_t satisfy; /* satisfy */
ngx_uint_t if_modified_since; /* if_modified_since */
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index f7c2ffa..f762a03 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -253,6 +253,8 @@
return;
}
+ c->requests++;
+
hc = c->data;
if (hc == NULL) {