Mercurial > hg > nginx

comparison src/http/modules/ngx_http_headers_filter_module.c @ 4246:d3568507db51 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dd1570b6f237
children ecf4608c2783 ea0f2e1f84d4
comparison
equal deleted inserted replaced
4245:8d39230df833 4246:d3568507db51
505 value[n].data++; 505 value[n].data++;
506 value[n].len--; 506 value[n].len--;
507 minus = 0; 507 minus = 0;
508 508
509 if (hcf->expires == NGX_HTTP_EXPIRES_MODIFIED) { 509 if (hcf->expires == NGX_HTTP_EXPIRES_MODIFIED) {
510 return "daily time can not be used with \"modified\" parameter"; 510 return "daily time cannot be used with \"modified\" parameter";
511 } 511 }
512 512
513 hcf->expires = NGX_HTTP_EXPIRES_DAILY; 513 hcf->expires = NGX_HTTP_EXPIRES_DAILY;
514 514
515 } else if (value[n].data[0] == '+') { 515 } else if (value[n].data[0] == '+') {