mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 18:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix negative upstream response time

Browse Source
This commit is contained in:
Igor Sysoev 2006-11-15 20:51:07 +00:00
parent c28473eef4
commit eb885fafd2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/http/ngx_http_upstream.c
View File

@ -512,6 +512,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
{ {
ngx_int_t rc; ngx_int_t rc;
ngx_time_t *tp; ngx_time_t *tp;
ngx_msec_int_t ms;
ngx_connection_t *c; ngx_connection_t *c;
r->connection->log->action = "connecting to upstream"; r->connection->log->action = "connecting to upstream";
@ -520,8 +521,8 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
if (u->state && u->state->response_time) { if (u->state && u->state->response_time) {
tp = ngx_timeofday(); tp = ngx_timeofday();
u->state->response_time = tp->sec * 1000 + tp->msec ms = tp->sec * 1000 + tp->msec - u->state->response_time;
- u->state->response_time; u->state->response_time = (ms >= 0) ? ms : 0;
} }
u->state = ngx_array_push(&u->states); u->state = ngx_array_push(&u->states);
@ -2057,7 +2058,8 @@ static void
ngx_http_upstream_finalize_request(ngx_http_request_t *r, ngx_http_upstream_finalize_request(ngx_http_request_t *r,
ngx_http_upstream_t *u, ngx_int_t rc) ngx_http_upstream_t *u, ngx_int_t rc)
{ {
ngx_time_t *tp; ngx_time_t *tp;
ngx_msec_int_t ms;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"finalize http upstream request: %i", rc); "finalize http upstream request: %i", rc);
@ -2066,8 +2068,8 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
if (u->state->response_time) { if (u->state->response_time) {
tp = ngx_timeofday(); tp = ngx_timeofday();
u->state->response_time = tp->sec * 1000 + tp->msec ms = tp->sec * 1000 + tp->msec - u->state->response_time;
- u->state->response_time; u->state->response_time = (ms >= 0) ? ms : 0;
} }
u->finalize_request(r, rc); u->finalize_request(r, rc);