Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_module.c @ 3523:66a244ee8cf7
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 |
---|---|
160 #endif | 160 #endif |
161 | 161 |
162 static char *ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post, | 162 static char *ngx_http_fastcgi_lowat_check(ngx_conf_t *cf, void *post, |
163 void *data); | 163 void *data); |
164 | 164 |
165 static char *ngx_http_fastcgi_upstream_max_fails_unsupported(ngx_conf_t *cf, | |
166 ngx_command_t *cmd, void *conf); | |
167 static char *ngx_http_fastcgi_upstream_fail_timeout_unsupported(ngx_conf_t *cf, | |
168 ngx_command_t *cmd, void *conf); | |
169 | |
170 | 165 |
171 static ngx_conf_post_t ngx_http_fastcgi_lowat_post = | 166 static ngx_conf_post_t ngx_http_fastcgi_lowat_post = |
172 { ngx_http_fastcgi_lowat_check }; | 167 { ngx_http_fastcgi_lowat_check }; |
173 | 168 |
174 | 169 |
396 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | 391 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
397 ngx_conf_set_bitmask_slot, | 392 ngx_conf_set_bitmask_slot, |
398 NGX_HTTP_LOC_CONF_OFFSET, | 393 NGX_HTTP_LOC_CONF_OFFSET, |
399 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.next_upstream), | 394 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.next_upstream), |
400 &ngx_http_fastcgi_next_upstream_masks }, | 395 &ngx_http_fastcgi_next_upstream_masks }, |
401 | |
402 { ngx_string("fastcgi_upstream_max_fails"), | |
403 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
404 ngx_http_fastcgi_upstream_max_fails_unsupported, | |
405 0, | |
406 0, | |
407 NULL }, | |
408 | |
409 { ngx_string("fastcgi_upstream_fail_timeout"), | |
410 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
411 ngx_http_fastcgi_upstream_fail_timeout_unsupported, | |
412 0, | |
413 0, | |
414 NULL }, | |
415 | 396 |
416 { ngx_string("fastcgi_param"), | 397 { ngx_string("fastcgi_param"), |
417 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, | 398 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, |
418 ngx_conf_set_keyval_slot, | 399 ngx_conf_set_keyval_slot, |
419 NGX_HTTP_LOC_CONF_OFFSET, | 400 NGX_HTTP_LOC_CONF_OFFSET, |
2747 | 2728 |
2748 #endif | 2729 #endif |
2749 | 2730 |
2750 return NGX_CONF_OK; | 2731 return NGX_CONF_OK; |
2751 } | 2732 } |
2752 | |
2753 | |
2754 static char * | |
2755 ngx_http_fastcgi_upstream_max_fails_unsupported(ngx_conf_t *cf, | |
2756 ngx_command_t *cmd, void *conf) | |
2757 { | |
2758 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
2759 "\"fastcgi_upstream_max_fails\" is not supported, " | |
2760 "use the \"max_fails\" parameter of the \"server\" directive ", | |
2761 "inside the \"upstream\" block"); | |
2762 | |
2763 return NGX_CONF_ERROR; | |
2764 } | |
2765 | |
2766 | |
2767 static char * | |
2768 ngx_http_fastcgi_upstream_fail_timeout_unsupported(ngx_conf_t *cf, | |
2769 ngx_command_t *cmd, void *conf) | |
2770 { | |
2771 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
2772 "\"fastcgi_upstream_fail_timeout\" is not supported, " | |
2773 "use the \"fail_timeout\" parameter of the \"server\" directive ", | |
2774 "inside the \"upstream\" block"); | |
2775 | |
2776 return NGX_CONF_ERROR; | |
2777 } |