Mercurial > hg > nginx-vendor-0-8

comparison src/http/modules/ngx_http_proxy_module.c @ 214:0ad9eeb6ac7f NGINX_0_3_54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.54 *) Feature: nginx now logs the subrequest information to the error log. *) Feature: the "proxy_next_upstream", "fastcgi_next_upstream", and "memcached_next_upstream" directives support the "off" parameter. *) Feature: the "debug_connection" directive supports the CIDR address form. *) Bugfix: if a response of proxied server or FastCGI server was converted from UTF-8 or back, then it may be transferred incomplete. *) Bugfix: the $upstream_response_time variable had the time of the first request to a backend only. *) Bugfix: nginx could not be built on amd64 platform; bug appeared in 0.3.53.
author Igor Sysoev <http://sysoev.ru>
date Tue, 11 Jul 2006 00:00:00 +0400
parents 56688ed172c8
children fa32d59d9a15
comparison
equal deleted inserted replaced
213:405beeeadf7f 214:0ad9eeb6ac7f
125 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, 125 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
126 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, 126 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
127 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 }, 127 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
128 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, 128 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
129 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, 129 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
130 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
130 { ngx_null_string, 0 } 131 { ngx_null_string, 0 }
131 }; 132 };
132 133
133 134
134 static ngx_command_t ngx_http_proxy_commands[] = { 135 static ngx_command_t ngx_http_proxy_commands[] = {
1646 prev->upstream.next_upstream, 1647 prev->upstream.next_upstream,
1647 (NGX_CONF_BITMASK_SET 1648 (NGX_CONF_BITMASK_SET
1648 |NGX_HTTP_UPSTREAM_FT_ERROR 1649 |NGX_HTTP_UPSTREAM_FT_ERROR
1649 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); 1650 |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
1650 1651
1652 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
1653 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
1654 |NGX_HTTP_UPSTREAM_FT_OFF;
1655 }
1656
1651 ngx_conf_merge_uint_value(conf->upstream.max_fails, 1657 ngx_conf_merge_uint_value(conf->upstream.max_fails,
1652 prev->upstream.max_fails, 1); 1658 prev->upstream.max_fails, 1);
1653 1659
1654 ngx_conf_merge_sec_value(conf->upstream.fail_timeout, 1660 ngx_conf_merge_sec_value(conf->upstream.fail_timeout,
1655 prev->upstream.fail_timeout, 10); 1661 prev->upstream.fail_timeout, 10);