Mercurial > hg > nginx-vendor-current

diff src/http/ngx_http_upstream.c @ 258:6ae1357b7b7c NGINX_0_4_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.14 *) Feature: the "proxy_pass_error_message" directive in IMAP/POP3 proxy. *) Feature: now configure detects system PCRE library on FreeBSD, Linux, and NetBSD. *) Bugfix: ngx_http_perl_module did not work with perl built with the threads support; bug appeared in 0.3.38. *) Bugfix: ngx_http_perl_module did not work if perl was called recursively. *) Bugfix: nginx ignored a host name in an request line. *) Bugfix: a worker process may got caught in an endless loop, if a FastCGI server sent too many data to the stderr. *) Bugfix: the $upstream_response_time variable may be negative if the system time was changed backward. *) 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.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Nov 2006 00:00:00 +0300
parents fbf2b2f66c9f
children 0effe91f6083
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -512,6 +512,7 @@ ngx_http_upstream_connect(ngx_http_reque
 {
     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_reque
 
     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_h
 
     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);