Mercurial > hg > nginx-vendor-1-0
diff src/http/ngx_http_upstream.c @ 160:73e8476f9142 NGINX_0_3_27
nginx 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.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 08 Feb 2006 00:00:00 +0300 |
parents | 36af50a5582d |
children | 6be073125f2e |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1457,11 +1457,10 @@ ngx_http_upstream_process_non_buffered_b 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 } 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 {