nginx-0.3.27-RELEASE importrelease-0.3.27

    *) Change: the "variables_hash_max_size" and
       "variables_hash_bucket_size" directives.

    *) Feature: the $body_bytes_sent variable can be used not only in the
       "log_format" directive.

    *) Feature: the $ssl_protocol and $ssl_cipher variables.

    *) Feature: the cache line size detection for widespread CPUs at start
       time.

    *) Feature: now the "accept_mutex" directive is supported using
       fcntl(2) on platforms different from i386, amd64, sparc64, and ppc.

    *) Feature: the "lock_file" directive and the --with-lock-path=PATH
       autoconfiguration directive.

    *) Bugfix: if the HTTPS protocol was used in the "proxy_pass" directive
       then the requests with the body was not transferred.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 3c3a9e6c1..9afa4d567 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1457,11 +1457,10 @@ ngx_http_upstream_process_non_buffered_body(ngx_event_t *ev)
     if (ev->timedout) {
         if (ev->write) {
             c->timedout = 1;
-            ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT,
-                          "client timed out");
+            ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
+
         } else {
-            ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT,
-                          "upstream timed out");
+            ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
         }
     }
 
@@ -1681,14 +1680,12 @@ ngx_http_upstream_process_body(ngx_event_t *ev)
             } else {
                 p->downstream_error = 1;
                 c->timedout = 1;
-                ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT,
-                              "client timed out");
+                ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out");
             }
 
         } else {
             p->upstream_error = 1;
-            ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT,
-                          "upstream timed out");
+            ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out");
         }
 
     } else {