From 03789a0a1c208ac62bee429497b9f6a46c0aa5ff Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 27 Nov 2006 11:18:50 +0000 Subject: Changes with nginx 0.4.14 27 Nov 2006 *) Feature: the "proxy_pass_error_message" directive in IMAP/POP3 proxy. *) Bugfix: ngx_http_perl_module did nto work with perl built with the threads support; bug appeared in 0.3.38. *) Bugfix: !!!!!!!!!! segfault perl. *) Bugfix: !!!!!!!!!! recursive perl. *) Bugfix: nginx ignored a host name in an request line. *) Bugfix: !!!!!!!!!! endless loop when too many FastCGI sent too many to stderr *) Bugfix: !!!!!!!! negative upstream response time *) Bugfix: the "Auth-Login-Attempt" parameter was not sent to IMAP/POP3 proxy authentication server when POP3 was used. *) Bugfix: a segmentation fault might occur if connect to IMAP/POP3 proxy authentication server failed. --- src/http/ngx_http_upstream.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/http/ngx_http_upstream.c') diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index b86f70128..f830236f4 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -512,6 +512,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) { ngx_int_t rc; ngx_time_t *tp; + ngx_msec_int_t ms; ngx_connection_t *c; 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) { tp = ngx_timeofday(); - u->state->response_time = tp->sec * 1000 + tp->msec - - u->state->response_time; + ms = tp->sec * 1000 + tp->msec - u->state->response_time; + u->state->response_time = (ms >= 0) ? ms : 0; } 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_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, "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) { tp = ngx_timeofday(); - u->state->response_time = tp->sec * 1000 + tp->msec - - u->state->response_time; + ms = tp->sec * 1000 + tp->msec - u->state->response_time; + u->state->response_time = (ms >= 0) ? ms : 0; } u->finalize_request(r, rc); -- cgit v1.2.1