diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-16 15:29:52 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-11-16 15:29:52 +0000 |
| commit | e69ffdaddf10c64c8bf1083d437c54e8fde98795 (patch) | |
| tree | 831525b2144ff547b617b014da766c55e42d807f /src/os/unix/ngx_alloc.c | |
| parent | 8da401f429b4061ce19e26cc7d01a3c045826d7c (diff) | |
| download | nginx-0.7.64.tar.gz | |
Changes with nginx 0.7.64 16 Nov 2009v0.7.64
*) Security: now SSL/TLS renegotiation is disabled.
Thanks to Maxim Dounin.
*) Bugfix: nginx sent gzipped responses to clients those do not support
gzip, if "gzip_static on" and "gzip_vary off"; the bug had appeared
in 0.7.63.
*) Bugfix: if names .domain.tld, .sub.domain.tld, and .domain-some.tld
were defined, then the name .sub.domain.tld was matched by
.domain.tld.
*) Bugfix: segmentation fault and infinite looping in resolver.
*) Bugfix: in resolver.
Thanks to Artem Bokhan.
*) Bugfix: resolver cache poisoning.
Thanks to Matthew Dempsky.
*) Bugfix: memory leak in resolver.
Thanks to Matthew Dempsky.
Diffstat (limited to 'src/os/unix/ngx_alloc.c')
| -rw-r--r-- | src/os/unix/ngx_alloc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c index c38d7d27e..253117434 100644 --- a/src/os/unix/ngx_alloc.c +++ b/src/os/unix/ngx_alloc.c @@ -51,11 +51,15 @@ void * ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) { void *p; + int err; - if (posix_memalign(&p, alignment, size) == -1) { - ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, + err = posix_memalign(&p, alignment, size); + + if (err) { + ngx_log_error(NGX_LOG_EMERG, log, err, "posix_memalign() %uz bytes aligned to %uz failed", size, alignment); + p = NULL; } ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, |