mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 02:09:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete warnings of proxy_upstream_max_fails, proxy_upstream_fail_timeout,

Browse Source 
fastcgi_upstream_max_fails, fastcgi_upstream_fail_timeout,
memcached_upstream_max_fails, and memcached_upstream_fail_timeout
directives obsolete since 0.5.0 version
This commit is contained in:
Igor Sysoev 2010-05-20 11:46:01 +00:00
parent ec94491f0c
commit f5f4126574
3 changed files with 0 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -162,11 +162,6 @@ static char *ngx_http_fastcgi_cache_key(ngx_conf_t *cf, ngx_command_t *cmd,
static char *ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post, static char *ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post,
void *data); void *data);
static char *ngx_http_fastcgi_upstream_max_fails_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
static char *ngx_http_fastcgi_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
static ngx_conf_post_t ngx_http_fastcgi_lowat_post = static ngx_conf_post_t ngx_http_fastcgi_lowat_post =
{ ngx_http_fastcgi_lowat_check }; { ngx_http_fastcgi_lowat_check };
@ -399,20 +394,6 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.next_upstream), offsetof(ngx_http_fastcgi_loc_conf_t, upstream.next_upstream),
&ngx_http_fastcgi_next_upstream_masks }, &ngx_http_fastcgi_next_upstream_masks },
{ ngx_string("fastcgi_upstream_max_fails"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_fastcgi_upstream_max_fails_unsupported,
0,
0,
NULL },
{ ngx_string("fastcgi_upstream_fail_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_fastcgi_upstream_fail_timeout_unsupported,
0,
0,
NULL },
{ ngx_string("fastcgi_param"), { ngx_string("fastcgi_param"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
ngx_conf_set_keyval_slot, ngx_conf_set_keyval_slot,
@ -2749,29 +2730,3 @@ ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post, void *data)
return NGX_CONF_OK; return NGX_CONF_OK;
} }
static char *
ngx_http_fastcgi_upstream_max_fails_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_upstream_max_fails\" is not supported, "
"use the \"max_fails\" parameter of the \"server\" directive ",
"inside the \"upstream\" block");
return NGX_CONF_ERROR;
}
static char *
ngx_http_fastcgi_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_upstream_fail_timeout\" is not supported, "
"use the \"fail_timeout\" parameter of the \"server\" directive ",
"inside the \"upstream\" block");
return NGX_CONF_ERROR;
}

45
src/http/modules/ngx_http_memcached_module.c
View File

@ -38,11 +38,6 @@ static char *ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf,
static char *ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, static char *ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
static char *ngx_http_memcached_upstream_max_fails_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
static char *ngx_http_memcached_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
static ngx_conf_bitmask_t ngx_http_memcached_next_upstream_masks[] = { static ngx_conf_bitmask_t ngx_http_memcached_next_upstream_masks[] = {
{ ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
@ -105,20 +100,6 @@ static ngx_command_t ngx_http_memcached_commands[] = {
offsetof(ngx_http_memcached_loc_conf_t, upstream.next_upstream), offsetof(ngx_http_memcached_loc_conf_t, upstream.next_upstream),
&ngx_http_memcached_next_upstream_masks }, &ngx_http_memcached_next_upstream_masks },
{ ngx_string("memcached_upstream_max_fails"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_memcached_upstream_max_fails_unsupported,
0,
0,
NULL },
{ ngx_string("memcached_upstream_fail_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_memcached_upstream_fail_timeout_unsupported,
0,
0,
NULL },
ngx_null_command ngx_null_command
}; };
@ -640,29 +621,3 @@ ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_OK; return NGX_CONF_OK;
} }
static char *
ngx_http_memcached_upstream_max_fails_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"memcached_upstream_max_fails\" is not supported, "
"use the \"max_fails\" parameter of the \"server\" directive ",
"inside the \"upstream\" block");
return NGX_CONF_ERROR;
}
static char *
ngx_http_memcached_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"memcached_upstream_fail_timeout\" is not supported, "
"use the \"fail_timeout\" parameter of the \"server\" directive ",
"inside the \"upstream\" block");
return NGX_CONF_ERROR;
}

45
src/http/modules/ngx_http_proxy_module.c
View File

@ -142,11 +142,6 @@ static char *ngx_http_proxy_cache_key(ngx_conf_t *cf, ngx_command_t *cmd,
static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data); static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data);
static char *ngx_http_proxy_upstream_max_fails_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
static char *ngx_http_proxy_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf);
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf, static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf,
ngx_http_proxy_loc_conf_t *plcf); ngx_http_proxy_loc_conf_t *plcf);
@ -422,20 +417,6 @@ static ngx_command_t ngx_http_proxy_commands[] = {
offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream), offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream),
&ngx_http_proxy_next_upstream_masks }, &ngx_http_proxy_next_upstream_masks },
{ ngx_string("proxy_upstream_max_fails"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_proxy_upstream_max_fails_unsupported,
0,
0,
NULL },
{ ngx_string("proxy_upstream_fail_timeout"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_proxy_upstream_fail_timeout_unsupported,
0,
0,
NULL },
{ ngx_string("proxy_pass_header"), { ngx_string("proxy_pass_header"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_str_array_slot, ngx_conf_set_str_array_slot,
@ -2959,32 +2940,6 @@ ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data)
} }
static char *
ngx_http_proxy_upstream_max_fails_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_upstream_max_fails\" is not supported, "
"use the \"max_fails\" parameter of the \"server\" directive ",
"inside the \"upstream\" block");
return NGX_CONF_ERROR;
}
static char *
ngx_http_proxy_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
ngx_command_t *cmd, void *conf)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_upstream_fail_timeout\" is not supported, "
"use the \"fail_timeout\" parameter of the \"server\" directive ",
"inside the \"upstream\" block");
return NGX_CONF_ERROR;
}
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
static ngx_int_t static ngx_int_t