Introduced the "keepalive_time" directive.
Similar to lingering_time, it limits total connection lifetime before
keepalive is switched off. The default is 1 hour, which is close to
the total maximum connection lifetime possible with default
keepalive_requests and keepalive_timeout.
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 9d8ac46..4716da4 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -162,6 +162,7 @@
ngx_atomic_uint_t number;
+ ngx_msec_t start_time;
ngx_uint_t requests;
unsigned buffered:8;
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 49616b7..7939070 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -4459,6 +4459,8 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+ c->start_time = ngx_current_msec;
+
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &rec->log, 0,
"connect to %V, fd:%d #%uA", &rec->server, s, c->number);
@@ -4545,6 +4547,8 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+ c->start_time = ngx_current_msec;
+
if (ngx_add_conn) {
if (ngx_add_conn(c) == NGX_ERROR) {
goto failed;
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 4364240..b05666c 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -256,6 +256,8 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+ c->start_time = ngx_current_msec;
+
#if (NGX_STAT_STUB)
(void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
#endif
diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
index 1999faf..f4a1c4b 100644
--- a/src/event/ngx_event_acceptex.c
+++ b/src/event/ngx_event_acceptex.c
@@ -80,6 +80,8 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+ c->start_time = ngx_current_msec;
+
ls->handler(c);
return;
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 1ffa798..adbbde6 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -193,6 +193,8 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+ c->start_time = ngx_current_msec;
+
if (ngx_add_conn) {
if (ngx_add_conn(c) == NGX_ERROR) {
goto failed;
diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c
index 5572830..a524ae0 100644
--- a/src/event/ngx_event_udp.c
+++ b/src/event/ngx_event_udp.c
@@ -363,6 +363,8 @@
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
+ c->start_time = ngx_current_msec;
+
#if (NGX_STAT_STUB)
(void) ngx_atomic_fetch_add(ngx_stat_handled, 1);
#endif
diff --git a/src/http/modules/ngx_http_upstream_keepalive_module.c b/src/http/modules/ngx_http_upstream_keepalive_module.c
index 1560807..bbd650b 100644
--- a/src/http/modules/ngx_http_upstream_keepalive_module.c
+++ b/src/http/modules/ngx_http_upstream_keepalive_module.c
@@ -13,6 +13,7 @@
typedef struct {
ngx_uint_t max_cached;
ngx_uint_t requests;
+ ngx_msec_t time;
ngx_msec_t timeout;
ngx_queue_t cache;
@@ -86,6 +87,13 @@
0,
NULL },
+ { ngx_string("keepalive_time"),
+ NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_msec_slot,
+ NGX_HTTP_SRV_CONF_OFFSET,
+ offsetof(ngx_http_upstream_keepalive_srv_conf_t, time),
+ NULL },
+
{ ngx_string("keepalive_timeout"),
NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
@@ -149,6 +157,7 @@
kcf = ngx_http_conf_upstream_srv_conf(us,
ngx_http_upstream_keepalive_module);
+ ngx_conf_init_msec_value(kcf->time, 3600000);
ngx_conf_init_msec_value(kcf->timeout, 60000);
ngx_conf_init_uint_value(kcf->requests, 100);
@@ -326,6 +335,10 @@
goto invalid;
}
+ if (ngx_current_msec - c->start_time > kp->conf->time) {
+ goto invalid;
+ }
+
if (!u->keepalive) {
goto invalid;
}
@@ -513,6 +526,7 @@
* conf->max_cached = 0;
*/
+ conf->time = NGX_CONF_UNSET_MSEC;
conf->timeout = NGX_CONF_UNSET_MSEC;
conf->requests = NGX_CONF_UNSET_UINT;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 9b94b32..9dda27a 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -495,6 +495,13 @@
offsetof(ngx_http_core_loc_conf_t, limit_rate_after),
NULL },
+ { ngx_string("keepalive_time"),
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_msec_slot,
+ NGX_HTTP_LOC_CONF_OFFSET,
+ offsetof(ngx_http_core_loc_conf_t, keepalive_time),
+ NULL },
+
{ ngx_string("keepalive_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
ngx_http_core_keepalive,
@@ -1335,6 +1342,11 @@
} else if (r->connection->requests >= clcf->keepalive_requests) {
r->keepalive = 0;
+ } else if (ngx_current_msec - r->connection->start_time
+ > clcf->keepalive_time)
+ {
+ r->keepalive = 0;
+
} else if (r->headers_in.msie6
&& r->method == NGX_HTTP_POST
&& (clcf->keepalive_disable
@@ -3500,6 +3512,7 @@
clcf->send_timeout = NGX_CONF_UNSET_MSEC;
clcf->send_lowat = NGX_CONF_UNSET_SIZE;
clcf->postpone_output = NGX_CONF_UNSET_SIZE;
+ clcf->keepalive_time = NGX_CONF_UNSET_MSEC;
clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
clcf->keepalive_header = NGX_CONF_UNSET;
clcf->keepalive_requests = NGX_CONF_UNSET_UINT;
@@ -3738,6 +3751,8 @@
conf->limit_rate_after = prev->limit_rate_after;
}
+ ngx_conf_merge_msec_value(conf->keepalive_time,
+ prev->keepalive_time, 3600000);
ngx_conf_merge_msec_value(conf->keepalive_timeout,
prev->keepalive_timeout, 75000);
ngx_conf_merge_sec_value(conf->keepalive_header,
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index 2aadae7..2341fd4 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -359,6 +359,7 @@
ngx_msec_t client_body_timeout; /* client_body_timeout */
ngx_msec_t send_timeout; /* send_timeout */
+ ngx_msec_t keepalive_time; /* keepalive_time */
ngx_msec_t keepalive_timeout; /* keepalive_timeout */
ngx_msec_t lingering_time; /* lingering_time */
ngx_msec_t lingering_timeout; /* lingering_timeout */
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index 69a94b6..3611a2e 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -1369,7 +1369,9 @@
ngx_http_core_module);
if (clcf->keepalive_timeout == 0
- || h2c->connection->requests >= clcf->keepalive_requests)
+ || h2c->connection->requests >= clcf->keepalive_requests
+ || ngx_current_msec - h2c->connection->start_time
+ > clcf->keepalive_time)
{
h2c->goaway = 1;