Mercurial > hg > nginx-quic
comparison src/http/ngx_http_upstream.c @ 611:3f8a2132b93d release-0.3.27
nginx-0.3.27-RELEASE import
*) 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 <igor@sysoev.ru> |
---|---|
date | Wed, 08 Feb 2006 15:33:12 +0000 |
parents | 9262f520ce21 |
children | c73c5c58c619 |
comparison
equal
deleted
inserted
replaced
610:200d628b47dd | 611:3f8a2132b93d |
---|---|
1455 } | 1455 } |
1456 | 1456 |
1457 if (ev->timedout) { | 1457 if (ev->timedout) { |
1458 if (ev->write) { | 1458 if (ev->write) { |
1459 c->timedout = 1; | 1459 c->timedout = 1; |
1460 ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT, | 1460 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
1461 "client timed out"); | 1461 |
1462 } else { | 1462 } else { |
1463 ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT, | 1463 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
1464 "upstream timed out"); | |
1465 } | 1464 } |
1466 } | 1465 } |
1467 | 1466 |
1468 r = c->data; | 1467 r = c->data; |
1469 u = r->upstream; | 1468 u = r->upstream; |
1679 } | 1678 } |
1680 | 1679 |
1681 } else { | 1680 } else { |
1682 p->downstream_error = 1; | 1681 p->downstream_error = 1; |
1683 c->timedout = 1; | 1682 c->timedout = 1; |
1684 ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT, | 1683 ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); |
1685 "client timed out"); | |
1686 } | 1684 } |
1687 | 1685 |
1688 } else { | 1686 } else { |
1689 p->upstream_error = 1; | 1687 p->upstream_error = 1; |
1690 ngx_log_error(NGX_LOG_ERR, c->log, NGX_ETIMEDOUT, | 1688 ngx_connection_error(c, NGX_ETIMEDOUT, "upstream timed out"); |
1691 "upstream timed out"); | |
1692 } | 1689 } |
1693 | 1690 |
1694 } else { | 1691 } else { |
1695 if (ev->write && ev->delayed) { | 1692 if (ev->write && ev->delayed) { |
1696 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, | 1693 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, |