diff options
author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:24:50 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 13:24:50 +0000 |
commit | 340e48b29f49b89bf7dc562533dae1d8d2ec2cc7 (patch) | |
tree | b3a423ebd7d008ca87a0ab512d472376c6a21a78 /src/os/unix/ngx_freebsd_sendfile_chain.c | |
parent | 8f86bdbb06393fdd48054c955aca4114f88c4ad7 (diff) | |
download | nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.tar.gz nginx-340e48b29f49b89bf7dc562533dae1d8d2ec2cc7.zip |
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.
Diffstat (limited to 'src/os/unix/ngx_freebsd_sendfile_chain.c')
-rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 70cdb7495..039243e96 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -11,7 +11,7 @@ /* * Although FreeBSD sendfile() allows to pass a header and a trailer, - * it can not send a header with a part of the file in one packet until + * it cannot send a header with a part of the file in one packet until * FreeBSD 5.3. Besides, over the fast ethernet connection sendfile() * may send the partially filled packets, i.e. the 8 file pages may be sent * as the 11 full 1460-bytes packets, then one incomplete 324-bytes packet, |