Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_fastcgi_module.c @ 214:0ad9eeb6ac7f NGINX_0_3_54
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 |
---|---|
166 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, | 166 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, |
167 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, | 167 { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, |
168 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 }, | 168 { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 }, |
169 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, | 169 { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 }, |
170 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, | 170 { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, |
171 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, | |
171 { ngx_null_string, 0 } | 172 { ngx_null_string, 0 } |
172 }; | 173 }; |
173 | 174 |
174 | 175 |
175 static ngx_command_t ngx_http_fastcgi_commands[] = { | 176 static ngx_command_t ngx_http_fastcgi_commands[] = { |
1692 prev->upstream.next_upstream, | 1693 prev->upstream.next_upstream, |
1693 (NGX_CONF_BITMASK_SET | 1694 (NGX_CONF_BITMASK_SET |
1694 |NGX_HTTP_UPSTREAM_FT_ERROR | 1695 |NGX_HTTP_UPSTREAM_FT_ERROR |
1695 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); | 1696 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); |
1696 | 1697 |
1698 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { | |
1699 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET | |
1700 |NGX_HTTP_UPSTREAM_FT_OFF; | |
1701 } | |
1702 | |
1697 ngx_conf_merge_uint_value(conf->upstream.max_fails, | 1703 ngx_conf_merge_uint_value(conf->upstream.max_fails, |
1698 prev->upstream.max_fails, 1); | 1704 prev->upstream.max_fails, 1); |
1699 | 1705 |
1700 ngx_conf_merge_sec_value(conf->upstream.fail_timeout, | 1706 ngx_conf_merge_sec_value(conf->upstream.fail_timeout, |
1701 prev->upstream.fail_timeout, 10); | 1707 prev->upstream.fail_timeout, 10); |