Mercurial > hg > nginx
comparison src/http/modules/ngx_http_log_module.c @ 4246:d3568507db51 stable-1.0
Merging r4132, r4134, r4143, r4183, r4191, r4199:
Various fixes related to error messages:
*) Removed old warning that suggested to use "server_name_in_redirect off"
(now the default) in place of no longer supported "server_name *".
*) Fixing directive name in error message if types hash size is not enough.
*) Replaced "can not" with "cannot" and "could not" in a bunch of places.
Fixed nearby grammar errors.
*) Overhauled error messages.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 13:24:50 +0000 |
parents | 17ab1927f80f |
children | 4919fb357a5d |
comparison
equal
deleted
inserted
replaced
4245:8d39230df833 | 4246:d3568507db51 |
---|---|
958 return NGX_CONF_ERROR; | 958 return NGX_CONF_ERROR; |
959 } | 959 } |
960 | 960 |
961 if (log->script) { | 961 if (log->script) { |
962 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 962 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
963 "buffered logs can not have variables in name"); | 963 "buffered logs cannot have variables in name"); |
964 return NGX_CONF_ERROR; | 964 return NGX_CONF_ERROR; |
965 } | 965 } |
966 | 966 |
967 name.len = value[3].len - 7; | 967 name.len = value[3].len - 7; |
968 name.data = value[3].data + 7; | 968 name.data = value[3].data + 7; |