Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 4593:834049edae24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed grammar in error messages.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 12 Apr 2012 19:35:41 +0000
parents 1ebec1d15a25
children 8036fc6af2df
comparison
equal deleted inserted replaced
4592:ab1649495d30 4593:834049edae24
2732 conf->upstream.busy_buffers_size_conf; 2732 conf->upstream.busy_buffers_size_conf;
2733 } 2733 }
2734 2734
2735 if (conf->upstream.busy_buffers_size < size) { 2735 if (conf->upstream.busy_buffers_size < size) {
2736 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2736 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2737 "\"proxy_busy_buffers_size\" must be equal or bigger than " 2737 "\"proxy_busy_buffers_size\" must be equal to or greater than "
2738 "maximum of the value of \"proxy_buffer_size\" and " 2738 "the maximum of the value of \"proxy_buffer_size\" and "
2739 "one of the \"proxy_buffers\""); 2739 "one of the \"proxy_buffers\"");
2740 2740
2741 return NGX_CONF_ERROR; 2741 return NGX_CONF_ERROR;
2742 } 2742 }
2743 2743
2763 conf->upstream.temp_file_write_size_conf; 2763 conf->upstream.temp_file_write_size_conf;
2764 } 2764 }
2765 2765
2766 if (conf->upstream.temp_file_write_size < size) { 2766 if (conf->upstream.temp_file_write_size < size) {
2767 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2767 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2768 "\"proxy_temp_file_write_size\" must be equal or bigger than " 2768 "\"proxy_temp_file_write_size\" must be equal to or greater "
2769 "maximum of the value of \"proxy_buffer_size\" and " 2769 "than the maximum of the value of \"proxy_buffer_size\" and "
2770 "one of the \"proxy_buffers\""); 2770 "one of the \"proxy_buffers\"");
2771 2771
2772 return NGX_CONF_ERROR; 2772 return NGX_CONF_ERROR;
2773 } 2773 }
2774 2774
2786 if (conf->upstream.max_temp_file_size != 0 2786 if (conf->upstream.max_temp_file_size != 0
2787 && conf->upstream.max_temp_file_size < size) 2787 && conf->upstream.max_temp_file_size < size)
2788 { 2788 {
2789 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2789 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2790 "\"proxy_max_temp_file_size\" must be equal to zero to disable " 2790 "\"proxy_max_temp_file_size\" must be equal to zero to disable "
2791 "the temporary files usage or must be equal or bigger than " 2791 "temporary files usage or must be equal to or greater than "
2792 "maximum of the value of \"proxy_buffer_size\" and " 2792 "the maximum of the value of \"proxy_buffer_size\" and "
2793 "one of the \"proxy_buffers\""); 2793 "one of the \"proxy_buffers\"");
2794 2794
2795 return NGX_CONF_ERROR; 2795 return NGX_CONF_ERROR;
2796 } 2796 }
2797 2797
3423 #endif 3423 #endif
3424 || clcf->noname) 3424 || clcf->noname)
3425 { 3425 {
3426 if (plcf->vars.uri.len) { 3426 if (plcf->vars.uri.len) {
3427 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3427 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3428 "\"proxy_pass\" may not have URI part in " 3428 "\"proxy_pass\" cannot have URI part in "
3429 "location given by regular expression, " 3429 "location given by regular expression, "
3430 "or inside named location, " 3430 "or inside named location, "
3431 "or inside the \"if\" statement, " 3431 "or inside \"if\" statement, "
3432 "or inside the \"limit_except\" block"); 3432 "or inside \"limit_except\" block");
3433 return NGX_CONF_ERROR; 3433 return NGX_CONF_ERROR;
3434 } 3434 }
3435 3435
3436 plcf->location.len = 0; 3436 plcf->location.len = 0;
3437 } 3437 }
3496 } 3496 }
3497 3497
3498 if (ngx_strcmp(value[1].data, "default") == 0) { 3498 if (ngx_strcmp(value[1].data, "default") == 0) {
3499 if (plcf->proxy_lengths) { 3499 if (plcf->proxy_lengths) {
3500 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3500 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3501 "\"proxy_redirect default\" may not be used " 3501 "\"proxy_redirect default\" cannot be used "
3502 "with \"proxy_pass\" directive with variables"); 3502 "with \"proxy_pass\" directive with variables");
3503 return NGX_CONF_ERROR; 3503 return NGX_CONF_ERROR;
3504 } 3504 }
3505 3505
3506 if (plcf->url.data == NULL) { 3506 if (plcf->url.data == NULL) {
3507 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 3507 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3508 "\"proxy_redirect default\" must go " 3508 "\"proxy_redirect default\" should be placed "
3509 "after the \"proxy_pass\" directive"); 3509 "after the \"proxy_pass\" directive");
3510 return NGX_CONF_ERROR; 3510 return NGX_CONF_ERROR;
3511 } 3511 }
3512 3512
3513 pr->handler = ngx_http_proxy_rewrite_complex_handler; 3513 pr->handler = ngx_http_proxy_rewrite_complex_handler;