Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 3523:66a244ee8cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delete warnings of proxy_upstream_max_fails, proxy_upstream_fail_timeout, fastcgi_upstream_max_fails, fastcgi_upstream_fail_timeout, memcached_upstream_max_fails, and memcached_upstream_fail_timeout directives obsolete since 0.5.0 version
author Igor Sysoev <igor@sysoev.ru>
date Thu, 20 May 2010 11:46:01 +0000
parents dd1570b6f237
children 62a4fd1e6e2c
comparison
equal deleted inserted replaced
3522:d24f030507cd 3523:66a244ee8cf7
140 void *conf); 140 void *conf);
141 #endif 141 #endif
142 142
143 static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data); 143 static char *ngx_http_proxy_lowat_check(ngx_conf_t *cf, void *post, void *data);
144 144
145 static char *ngx_http_proxy_upstream_max_fails_unsupported(ngx_conf_t *cf,
146 ngx_command_t *cmd, void *conf);
147 static char *ngx_http_proxy_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
148 ngx_command_t *cmd, void *conf);
149
150 #if (NGX_HTTP_SSL) 145 #if (NGX_HTTP_SSL)
151 static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf, 146 static ngx_int_t ngx_http_proxy_set_ssl(ngx_conf_t *cf,
152 ngx_http_proxy_loc_conf_t *plcf); 147 ngx_http_proxy_loc_conf_t *plcf);
153 #endif 148 #endif
154 static void ngx_http_proxy_set_vars(ngx_url_t *u, ngx_http_proxy_vars_t *v); 149 static void ngx_http_proxy_set_vars(ngx_url_t *u, ngx_http_proxy_vars_t *v);
419 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, 414 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
420 ngx_conf_set_bitmask_slot, 415 ngx_conf_set_bitmask_slot,
421 NGX_HTTP_LOC_CONF_OFFSET, 416 NGX_HTTP_LOC_CONF_OFFSET,
422 offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream), 417 offsetof(ngx_http_proxy_loc_conf_t, upstream.next_upstream),
423 &ngx_http_proxy_next_upstream_masks }, 418 &ngx_http_proxy_next_upstream_masks },
424
425 { ngx_string("proxy_upstream_max_fails"),
426 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
427 ngx_http_proxy_upstream_max_fails_unsupported,
428 0,
429 0,
430 NULL },
431
432 { ngx_string("proxy_upstream_fail_timeout"),
433 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
434 ngx_http_proxy_upstream_fail_timeout_unsupported,
435 0,
436 0,
437 NULL },
438 419
439 { ngx_string("proxy_pass_header"), 420 { ngx_string("proxy_pass_header"),
440 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 421 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
441 ngx_conf_set_str_array_slot, 422 ngx_conf_set_str_array_slot,
442 NGX_HTTP_LOC_CONF_OFFSET, 423 NGX_HTTP_LOC_CONF_OFFSET,
2957 2938
2958 return NGX_CONF_OK; 2939 return NGX_CONF_OK;
2959 } 2940 }
2960 2941
2961 2942
2962 static char *
2963 ngx_http_proxy_upstream_max_fails_unsupported(ngx_conf_t *cf,
2964 ngx_command_t *cmd, void *conf)
2965 {
2966 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2967 "\"proxy_upstream_max_fails\" is not supported, "
2968 "use the \"max_fails\" parameter of the \"server\" directive ",
2969 "inside the \"upstream\" block");
2970
2971 return NGX_CONF_ERROR;
2972 }
2973
2974
2975 static char *
2976 ngx_http_proxy_upstream_fail_timeout_unsupported(ngx_conf_t *cf,
2977 ngx_command_t *cmd, void *conf)
2978 {
2979 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2980 "\"proxy_upstream_fail_timeout\" is not supported, "
2981 "use the \"fail_timeout\" parameter of the \"server\" directive ",
2982 "inside the \"upstream\" block");
2983
2984 return NGX_CONF_ERROR;
2985 }
2986
2987
2988 #if (NGX_HTTP_SSL) 2943 #if (NGX_HTTP_SSL)
2989 2944
2990 static ngx_int_t 2945 static ngx_int_t
2991 ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf) 2946 ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf)
2992 { 2947 {