mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed grammar in error messages.

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-04-12 19:35:41 +00:00
parent e6724ebe54
commit 43d2b1c045
12 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/nginx.c
View File

@ -649,7 +649,7 @@ ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv)
if (ngx_rename_file(ccf->oldpid.data, ccf->pid.data) != NGX_OK) { if (ngx_rename_file(ccf->oldpid.data, ccf->pid.data) != NGX_OK) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
ngx_rename_file_n " %s back to %s failed after " ngx_rename_file_n " %s back to %s failed after "
"the try to execute the new binary process \"%s\"", "an attempt to execute new binary process \"%s\"",
ccf->oldpid.data, ccf->pid.data, argv[0]); ccf->oldpid.data, ccf->pid.data, argv[0]);
} }
} }

3
src/core/ngx_conf_file.c
View File

@ -1481,7 +1481,8 @@ ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data)
} }
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"value must be equal or more than %i", bounds->low); "value must be equal to or greater than %i",
bounds->low);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }

4
src/event/ngx_event.c
View File

@ -471,7 +471,7 @@ ngx_event_module_init(ngx_cycle_t *cycle)
(ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile; (ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile;
ngx_log_error(NGX_LOG_WARN, cycle->log, 0, ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
"%ui worker_connections are more than " "%ui worker_connections exceed "
"open file resource limit: %i", "open file resource limit: %i",
ecf->connections, limit); ecf->connections, limit);
} }
@ -489,7 +489,7 @@ ngx_event_module_init(ngx_cycle_t *cycle)
} }
/* cl should be equal or bigger than cache line size */ /* cl should be equal to or greater than cache line size */
cl = 128; cl = 128;

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

@ -1254,7 +1254,7 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) { if (f->type == NGX_HTTP_FASTCGI_STDOUT && f->length == 0) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"upstream closed prematurely FastCGI stdout"); "upstream prematurely closed FastCGI stdout");
return NGX_HTTP_UPSTREAM_INVALID_HEADER; return NGX_HTTP_UPSTREAM_INVALID_HEADER;
} }
@ -2198,8 +2198,8 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.busy_buffers_size < size) { if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_busy_buffers_size\" must be equal or bigger than " "\"fastcgi_busy_buffers_size\" must be equal to or greater than "
"maximum of the value of \"fastcgi_buffer_size\" and " "the maximum of the value of \"fastcgi_buffer_size\" and "
"one of the \"fastcgi_buffers\""); "one of the \"fastcgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -2229,8 +2229,8 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.temp_file_write_size < size) { if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_temp_file_write_size\" must be equal or bigger than " "\"fastcgi_temp_file_write_size\" must be equal to or greater "
"maximum of the value of \"fastcgi_buffer_size\" and " "than the maximum of the value of \"fastcgi_buffer_size\" and "
"one of the \"fastcgi_buffers\""); "one of the \"fastcgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -2253,8 +2253,8 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
{ {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"fastcgi_max_temp_file_size\" must be equal to zero to disable " "\"fastcgi_max_temp_file_size\" must be equal to zero to disable "
"the temporary files usage or must be equal or bigger than " "temporary files usage or must be equal to or greater than "
"maximum of the value of \"fastcgi_buffer_size\" and " "the maximum of the value of \"fastcgi_buffer_size\" and "
"one of the \"fastcgi_buffers\""); "one of the \"fastcgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;

6
src/http/modules/ngx_http_geo_module.c
View File

@ -566,7 +566,7 @@ ngx_http_geo_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
if (ctx->binary_include) { if (ctx->binary_include) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"binary geo range base \"%s\" may not be mixed with usual entries", "binary geo range base \"%s\" cannot be mixed with usual entries",
ctx->include_name.data); ctx->include_name.data);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@ -1195,7 +1195,7 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
if (ctx->outside_entries) { if (ctx->outside_entries) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"binary geo range base \"%s\" may not be mixed with usual entries", "binary geo range base \"%s\" cannot be mixed with usual entries",
name->data); name->data);
rc = NGX_ERROR; rc = NGX_ERROR;
goto done; goto done;
@ -1203,7 +1203,7 @@ ngx_http_geo_include_binary_base(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
if (ctx->binary_include) { if (ctx->binary_include) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"second binary geo range base \"%s\" may not be mixed with \"%s\"", "second binary geo range base \"%s\" cannot be mixed with \"%s\"",
name->data, ctx->include_name.data); name->data, ctx->include_name.data);
rc = NGX_ERROR; rc = NGX_ERROR;
goto done; goto done;

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

@ -2734,8 +2734,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.busy_buffers_size < size) { if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_busy_buffers_size\" must be equal or bigger than " "\"proxy_busy_buffers_size\" must be equal to or greater than "
"maximum of the value of \"proxy_buffer_size\" and " "the maximum of the value of \"proxy_buffer_size\" and "
"one of the \"proxy_buffers\""); "one of the \"proxy_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -2765,8 +2765,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.temp_file_write_size < size) { if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_temp_file_write_size\" must be equal or bigger than " "\"proxy_temp_file_write_size\" must be equal to or greater "
"maximum of the value of \"proxy_buffer_size\" and " "than the maximum of the value of \"proxy_buffer_size\" and "
"one of the \"proxy_buffers\""); "one of the \"proxy_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -2788,8 +2788,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
{ {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_max_temp_file_size\" must be equal to zero to disable " "\"proxy_max_temp_file_size\" must be equal to zero to disable "
"the temporary files usage or must be equal or bigger than " "temporary files usage or must be equal to or greater than "
"maximum of the value of \"proxy_buffer_size\" and " "the maximum of the value of \"proxy_buffer_size\" and "
"one of the \"proxy_buffers\""); "one of the \"proxy_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -3425,11 +3425,11 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
if (plcf->vars.uri.len) { if (plcf->vars.uri.len) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_pass\" may not have URI part in " "\"proxy_pass\" cannot have URI part in "
"location given by regular expression, " "location given by regular expression, "
"or inside named location, " "or inside named location, "
"or inside the \"if\" statement, " "or inside \"if\" statement, "
"or inside the \"limit_except\" block"); "or inside \"limit_except\" block");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@ -3498,14 +3498,14 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (ngx_strcmp(value[1].data, "default") == 0) { if (ngx_strcmp(value[1].data, "default") == 0) {
if (plcf->proxy_lengths) { if (plcf->proxy_lengths) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_redirect default\" may not be used " "\"proxy_redirect default\" cannot be used "
"with \"proxy_pass\" directive with variables"); "with \"proxy_pass\" directive with variables");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
if (plcf->url.data == NULL) { if (plcf->url.data == NULL) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"proxy_redirect default\" must go " "\"proxy_redirect default\" should be placed "
"after the \"proxy_pass\" directive"); "after the \"proxy_pass\" directive");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }

12
src/http/modules/ngx_http_scgi_module.c
View File

@ -1173,8 +1173,8 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.busy_buffers_size < size) { if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"scgi_busy_buffers_size\" must be equal or bigger " "\"scgi_busy_buffers_size\" must be equal to or greater "
"than maximum of the value of \"scgi_buffer_size\" and " "than the maximum of the value of \"scgi_buffer_size\" and "
"one of the \"scgi_buffers\""); "one of the \"scgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -1204,8 +1204,8 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.temp_file_write_size < size) { if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"scgi_temp_file_write_size\" must be equal or bigger than " "\"scgi_temp_file_write_size\" must be equal to or greater than "
"maximum of the value of \"scgi_buffer_size\" and " "the maximum of the value of \"scgi_buffer_size\" and "
"one of the \"scgi_buffers\""); "one of the \"scgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -1227,8 +1227,8 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
&& conf->upstream.max_temp_file_size < size) { && conf->upstream.max_temp_file_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"scgi_max_temp_file_size\" must be equal to zero to disable " "\"scgi_max_temp_file_size\" must be equal to zero to disable "
"the temporary files usage or must be equal or bigger than " "temporary files usage or must be equal to or greater than "
"maximum of the value of \"scgi_buffer_size\" and " "the maximum of the value of \"scgi_buffer_size\" and "
"one of the \"scgi_buffers\""); "one of the \"scgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;

2
src/http/modules/ngx_http_split_clients_module.c
View File

@ -177,7 +177,7 @@ ngx_conf_split_clients_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
sum = part[i].percent ? sum + part[i].percent : 10000; sum = part[i].percent ? sum + part[i].percent : 10000;
if (sum > 10000) { if (sum > 10000) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"percent sum is more than 100%%"); "percent total is greater than 100%%");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }

6
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -2003,7 +2003,7 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
if (set && stub) { if (set && stub) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"\"set\" and \"stub\" may not be used together " "\"set\" and \"stub\" cannot be used together "
"in \"include\" SSI command"); "in \"include\" SSI command");
return NGX_HTTP_SSI_ERROR; return NGX_HTTP_SSI_ERROR;
} }
@ -2011,7 +2011,7 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
if (wait) { if (wait) {
if (uri == NULL) { if (uri == NULL) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"\"wait\" may not be used with file=\"%V\"", file); "\"wait\" cannot be used with file=\"%V\"", file);
return NGX_HTTP_SSI_ERROR; return NGX_HTTP_SSI_ERROR;
} }
@ -2188,7 +2188,7 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
} else { } else {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"only one subrequest may be waited at the same time"); "can only wait for one subrequest at a time");
} }
return NGX_OK; return NGX_OK;

12
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -1216,8 +1216,8 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.busy_buffers_size < size) { if (conf->upstream.busy_buffers_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"uwsgi_busy_buffers_size\" must be equal or bigger " "\"uwsgi_busy_buffers_size\" must be equal to or greater "
"than maximum of the value of \"uwsgi_buffer_size\" and " "than the maximum of the value of \"uwsgi_buffer_size\" and "
"one of the \"uwsgi_buffers\""); "one of the \"uwsgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -1247,8 +1247,8 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->upstream.temp_file_write_size < size) { if (conf->upstream.temp_file_write_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"uwsgi_temp_file_write_size\" must be equal or bigger than " "\"uwsgi_temp_file_write_size\" must be equal to or greater than "
"maximum of the value of \"uwsgi_buffer_size\" and " "the maximum of the value of \"uwsgi_buffer_size\" and "
"one of the \"uwsgi_buffers\""); "one of the \"uwsgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -1270,8 +1270,8 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
&& conf->upstream.max_temp_file_size < size) { && conf->upstream.max_temp_file_size < size) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"\"uwsgi_max_temp_file_size\" must be equal to zero to disable " "\"uwsgi_max_temp_file_size\" must be equal to zero to disable "
"the temporary files usage or must be equal or bigger than " "temporary files usage or must be equal to or greater than "
"maximum of the value of \"uwsgi_buffer_size\" and " "the maximum of the value of \"uwsgi_buffer_size\" and "
"one of the \"uwsgi_buffers\""); "one of the \"uwsgi_buffers\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;

4
src/http/ngx_http_request.c
View File

@ -1175,7 +1175,7 @@ ngx_http_read_request_header(ngx_http_request_t *r)
if (n == 0) { if (n == 0) {
ngx_log_error(NGX_LOG_INFO, c->log, 0, ngx_log_error(NGX_LOG_INFO, c->log, 0,
"client closed prematurely connection"); "client prematurely closed connection");
} }
if (n == 0 || n == NGX_ERROR) { if (n == 0 || n == NGX_ERROR) {
@ -2426,7 +2426,7 @@ closed:
} }
ngx_log_error(NGX_LOG_INFO, c->log, err, ngx_log_error(NGX_LOG_INFO, c->log, err,
"client closed prematurely connection"); "client prematurely closed connection");
ngx_http_finalize_request(r, 0); ngx_http_finalize_request(r, 0);
} }

2
src/http/ngx_http_request_body.c
View File

@ -303,7 +303,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
if (n == 0) { if (n == 0) {
ngx_log_error(NGX_LOG_INFO, c->log, 0, ngx_log_error(NGX_LOG_INFO, c->log, 0,
"client closed prematurely connection"); "client prematurely closed connection");
} }
if (n == 0 || n == NGX_ERROR) { if (n == 0 || n == NGX_ERROR) {