Mercurial > hg > nginx-vendor-0-7
diff src/os/unix/ngx_alloc.c @ 10:46833bd150cb NGINX_0_1_5
nginx 0.1.5
*) Bugfix: on Solaris and Linux there may be too many "recvmsg()
returned not enough data" alerts.
*) Bugfix: there were the "writev() failed (22: Invalid argument)"
errors on Solaris in proxy mode without sendfile. On other platforms
that do not support sendfile at all the process got caught in an
endless loop.
*) Bugfix: segmentation fault on Solaris in proxy mode and using
sendfile.
*) Bugfix: segmentation fault on Solaris.
*) Bugfix: on-line upgrade did not work on Linux.
*) Bugfix: the ngx_http_autoindex_module module did not escape the
spaces, the quotes, and the percent signs in the directory listing.
*) Change: the decrease of the copy operations.
*) Feature: the userid_p3p directive.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 11 Nov 2004 00:00:00 +0300 |
parents | f0b350454894 |
children | 6f8b0dc0f8dd |
line wrap: on
line diff
--- a/src/os/unix/ngx_alloc.c +++ b/src/os/unix/ngx_alloc.c @@ -17,11 +17,10 @@ void *ngx_alloc(size_t size, ngx_log_t * if (!(p = malloc(size))) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "malloc() " SIZE_T_FMT " bytes failed", size); + "malloc() %uz bytes failed", size); } - ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, - "malloc: " PTR_FMT ":" SIZE_T_FMT, p, size); + ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %p:%uz", p, size); return p; } @@ -49,12 +48,12 @@ void *ngx_memalign(size_t alignment, siz if (posix_memalign(&p, alignment, size) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "posix_memalign() " SIZE_T_FMT " bytes aligned to " - SIZE_T_FMT " failed", size, alignment); + "posix_memalign() %uz bytes aligned to %uz failed", + size, alignment); } ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, - "posix_memalign: " PTR_FMT ":" SIZE_T_FMT, p, size); + "posix_memalign: %p:%uz", p, size); return p; } @@ -67,12 +66,12 @@ void *ngx_memalign(size_t alignment, siz if (!(p = memalign(alignment, size))) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "memalign() " SIZE_T_FMT " bytes aligned to " - SIZE_T_FMT " failed", size, alignment); + "memalign() %uz bytes aligned to %uz failed", + size, alignment); } ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, - "memalign: " PTR_FMT ":" SIZE_T_FMT, p, size); + "memalign: %p:%uz", p, size); return p; }