Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_memcached_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
43 static ngx_conf_bitmask_t ngx_http_memcached_next_upstream_masks[] = { 43 static ngx_conf_bitmask_t ngx_http_memcached_next_upstream_masks[] = {
44 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, 44 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
45 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, 45 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT },
46 { ngx_string("invalid_response"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, 46 { ngx_string("invalid_response"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
47 { ngx_string("not_found"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, 47 { ngx_string("not_found"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
48 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
48 { ngx_null_string, 0 } 49 { ngx_null_string, 0 }
49 }; 50 };
50 51
51 52
52 static ngx_command_t ngx_http_memcached_commands[] = { 53 static ngx_command_t ngx_http_memcached_commands[] = {
558 prev->upstream.next_upstream, 559 prev->upstream.next_upstream,
559 (NGX_CONF_BITMASK_SET 560 (NGX_CONF_BITMASK_SET
560 |NGX_HTTP_UPSTREAM_FT_ERROR 561 |NGX_HTTP_UPSTREAM_FT_ERROR
561 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); 562 |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
562 563
564 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
565 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
566 |NGX_HTTP_UPSTREAM_FT_OFF;
567 }
568
563 ngx_conf_merge_uint_value(conf->upstream.max_fails, 569 ngx_conf_merge_uint_value(conf->upstream.max_fails,
564 prev->upstream.max_fails, 1); 570 prev->upstream.max_fails, 1);
565 571
566 ngx_conf_merge_sec_value(conf->upstream.fail_timeout, 572 ngx_conf_merge_sec_value(conf->upstream.fail_timeout,
567 prev->upstream.fail_timeout, 10); 573 prev->upstream.fail_timeout, 10);