From: Igor Sysoev <igor@sysoev.ru>
Date: Sun, 23 Sep 2007 19:23:30 +0000 (+0000)
Subject: r1470 merge:
X-Git-Tag: release-0.5.32~7
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=1ec29e5d815d553915d59ffa467eb3ce3ae7c4f5;p=nginx.git

r1470 merge:

connection error should be logged with "connecting to upstream" action,
the bug was introduced in r1154
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 7986f0fdf..919dc5903 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1288,6 +1288,7 @@ ngx_http_upstream_test_connect(ngx_connection_t *c)
 
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT)  {
         if (c->write->pending_eof) {
+            c->log->action = "connecting to upstream";
             (void) ngx_connection_error(c, c->write->kq_errno,
                                     "kevent() reported that connect() failed");
             return NGX_ERROR;
@@ -1311,6 +1312,7 @@ ngx_http_upstream_test_connect(ngx_connection_t *c)
         }
 
         if (err) {
+            c->log->action = "connecting to upstream";
             (void) ngx_connection_error(c, err, "connect() failed");
             return NGX_ERROR;
         }