Mercurial > hg > nginx
comparison src/http/ngx_http.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 | 3770119af0b5 |
children | e648bb470e12 |
comparison
equal
deleted
inserted
replaced
4245:8d39230df833 | 4246:d3568507db51 |
---|---|
1224 #if (NGX_HTTP_SSL) | 1224 #if (NGX_HTTP_SSL) |
1225 ngx_uint_t ssl; | 1225 ngx_uint_t ssl; |
1226 #endif | 1226 #endif |
1227 | 1227 |
1228 /* | 1228 /* |
1229 * we can not compare whole sockaddr struct's as kernel | 1229 * we cannot compare whole sockaddr struct's as kernel |
1230 * may fill some fields in inherited sockaddr struct's | 1230 * may fill some fields in inherited sockaddr struct's |
1231 */ | 1231 */ |
1232 | 1232 |
1233 sa = &lsopt->u.sockaddr; | 1233 sa = &lsopt->u.sockaddr; |
1234 | 1234 |
1279 | 1279 |
1280 if (lsopt->set) { | 1280 if (lsopt->set) { |
1281 | 1281 |
1282 if (addr[i].opt.set) { | 1282 if (addr[i].opt.set) { |
1283 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 1283 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
1284 "a duplicate listen options for %s", addr[i].opt.addr); | 1284 "duplicate listen options for %s", addr[i].opt.addr); |
1285 return NGX_ERROR; | 1285 return NGX_ERROR; |
1286 } | 1286 } |
1287 | 1287 |
1288 addr[i].opt = *lsopt; | 1288 addr[i].opt = *lsopt; |
1289 } | 1289 } |