diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-04-16 19:35:55 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-04-16 19:35:55 +0300 |
| commit | f29e48f7eed3e0593098818b42bd17dee17cc601 (patch) | |
| tree | 18ff22a5988a25aacc60c4beb836e98794dcb051 /src/core | |
| parent | 8ba7adf037cc32300e19034e371a7add5222e47e (diff) | |
| parent | a64190933e06758d50eea926e6a55974645096fd (diff) | |
| download | nginx-f29e48f7eed3e0593098818b42bd17dee17cc601.tar.gz nginx-f29e48f7eed3e0593098818b42bd17dee17cc601.zip | |
Merged with the default branch.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_connection.h | 1 | ||||
| -rw-r--r-- | src/core/ngx_resolver.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index ba70b4ceb..8a3560179 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1019009 -#define NGINX_VERSION "1.19.9" +#define nginx_version 1019010 +#define NGINX_VERSION "1.19.10" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index 548c83569..4578d9065 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -167,6 +167,7 @@ struct ngx_connection_s { 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 49616b776..793907010 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -4459,6 +4459,8 @@ ngx_udp_connect(ngx_resolver_connection_t *rec) 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 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec) 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; |