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

the previous fix does not actually fix overflow

Browse Source
This commit is contained in:
Igor Sysoev 2006-12-06 11:33:18 +00:00
parent 8b6844c747
commit 8f98581bbf
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/http/ngx_http_upstream.c
View File

@ -493,17 +493,16 @@ 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";
r->connection->single_connection = 0; r->connection->single_connection = 0;
if (u->state && u->state->response_time) { if (u->state && u->state->response_sec) {
tp = ngx_timeofday(); tp = ngx_timeofday();
ms = (ngx_msec_t) tp->sec * 1000 + tp->msec - u->state->response_time; u->state->response_sec = tp->sec - u->state->response_sec;
u->state->response_time = (ms >= 0) ? ms : 0; u->state->response_msec = tp->msec - u->state->response_msec;
} }
u->state = ngx_array_push(&u->states); u->state = ngx_array_push(&u->states);
@ -516,7 +515,8 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t)); ngx_memzero(u->state, sizeof(ngx_http_upstream_state_t));
tp = ngx_timeofday(); tp = ngx_timeofday();
u->state->response_time = (ngx_msec_t) tp->sec * 1000 + tp->msec; u->state->response_sec = tp->sec;
u->state->response_msec = tp->msec;
rc = ngx_event_connect_peer(&u->peer); rc = ngx_event_connect_peer(&u->peer);
@ -2043,18 +2043,17 @@ 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);
*u->cleanup = NULL; *u->cleanup = NULL;
if (u->state->response_time) { if (u->state->response_sec) {
tp = ngx_timeofday(); tp = ngx_timeofday();
ms = (ngx_msec_t) tp->sec * 1000 + tp->msec - u->state->response_time; u->state->response_sec = tp->sec - u->state->response_sec;
u->state->response_time = (ms >= 0) ? ms : 0; u->state->response_msec = tp->msec - u->state->response_msec;
} }
u->finalize_request(r, rc); u->finalize_request(r, rc);
@ -2531,6 +2530,7 @@ ngx_http_upstream_response_time_variable(ngx_http_request_t *r,
u_char *p; u_char *p;
size_t len; size_t len;
ngx_uint_t i; ngx_uint_t i;
ngx_msec_int_t ms;
ngx_http_upstream_t *u; ngx_http_upstream_t *u;
ngx_http_upstream_state_t *state; ngx_http_upstream_state_t *state;
@ -2562,9 +2562,9 @@ ngx_http_upstream_response_time_variable(ngx_http_request_t *r,
*p++ = '-'; *p++ = '-';
} else { } else {
p = ngx_sprintf(p, "%d.%03d", ms = state[i].response_sec * 1000 + state[i].response_msec;
state[i].response_time / 1000, ms = (ms >= 0) ? ms : 0;
state[i].response_time % 1000); p = ngx_sprintf(p, "%d.%03d", ms / 1000, ms % 1000);
} }
if (++i == u->states.nelts) { if (++i == u->states.nelts) {

3
src/http/ngx_http_upstream.h
View File

@ -35,7 +35,8 @@ typedef struct {
ngx_uint_t bl_state; ngx_uint_t bl_state;
ngx_uint_t status; ngx_uint_t status;
ngx_msec_t response_time; time_t response_sec;
ngx_uint_t response_msec;
ngx_str_t *peer; ngx_str_t *peer;
} ngx_http_upstream_state_t; } ngx_http_upstream_state_t;