From 1b73583ba2c0e4b72d951218827e0c621427d389 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 11 Nov 2004 14:07:14 +0000 Subject: nginx-0.1.5-RELEASE import *) 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. --- src/os/unix/ngx_shared.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/os/unix/ngx_shared.c') diff --git a/src/os/unix/ngx_shared.c b/src/os/unix/ngx_shared.c index 60f2de029..7f3c5e9be 100644 --- a/src/os/unix/ngx_shared.c +++ b/src/os/unix/ngx_shared.c @@ -18,8 +18,7 @@ void *ngx_create_shared_memory(size_t size, ngx_log_t *log) if (p == MAP_FAILED) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, - "mmap(MAP_ANON|MAP_SHARED, " SIZE_T_FMT ") failed", - size); + "mmap(MAP_ANON|MAP_SHARED, %uz) failed", size); return NULL; } @@ -45,8 +44,7 @@ void *ngx_create_shared_memory(size_t size, ngx_log_t *log) if (p == MAP_FAILED) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, - "mmap(/dev/zero, MAP_SHARED, " SIZE_T_FMT ") failed", - size); + "mmap(/dev/zero, MAP_SHARED, %uz) failed", size); p = NULL; } @@ -72,7 +70,7 @@ void *ngx_create_shared_memory(size_t size, ngx_log_t *log) if (id == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, - "shmget(" SIZE_T_FMT ") failed", size); + "shmget(%uz) failed", size); return NULL; } -- cgit v1.2.3