]> git.kaiwu.me - nginx.git/commit
Merging r4132, r4134, r4143, r4183, r4191, r4199:
authorIgor Sysoev <igor@sysoev.ru>
Tue, 1 Nov 2011 13:24:50 +0000 (13:24 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Tue, 1 Nov 2011 13:24:50 +0000 (13:24 +0000)
commit340e48b29f49b89bf7dc562533dae1d8d2ec2cc7
treeb3a423ebd7d008ca87a0ab512d472376c6a21a78
parent8f86bdbb06393fdd48054c955aca4114f88c4ad7
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.
17 files changed:
src/core/ngx_cycle.c
src/core/ngx_palloc.c
src/core/ngx_string.c
src/event/ngx_event.c
src/event/ngx_event_timer.c
src/http/modules/ngx_http_dav_module.c
src/http/modules/ngx_http_headers_filter_module.c
src/http/modules/ngx_http_log_module.c
src/http/ngx_http.c
src/http/ngx_http_core_module.c
src/http/ngx_http_upstream.c
src/os/unix/ngx_errno.c
src/os/unix/ngx_file_aio_read.c
src/os/unix/ngx_freebsd_sendfile_chain.c
src/os/unix/ngx_process.c
src/os/unix/ngx_process_cycle.c
src/os/win32/ngx_process_cycle.c