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/core/ngx_palloc.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/core/ngx_palloc.c')
| -rw-r--r-- | src/core/ngx_palloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index 35f13119c..9eac114b7 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -68,7 +68,7 @@ ngx_destroy_pool(ngx_pool_t *pool) /* * we could allocate the pool->log from this pool - * so we can not use this log while the free()ing the pool + * so we cannot use this log while free()ing the pool */ for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) { |