Mercurial > hg > nginx-vendor-current
view src/os/unix/ngx_shared.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 | 74b1868dd3cd |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> #if (HAVE_MAP_ANON) void *ngx_create_shared_memory(size_t size, ngx_log_t *log) { void *p; p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_ANON|MAP_SHARED, -1, 0); if (p == MAP_FAILED) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "mmap(MAP_ANON|MAP_SHARED, %uz) failed", size); return NULL; } return p; } #elif (HAVE_MAP_DEVZERO) void *ngx_create_shared_memory(size_t size, ngx_log_t *log) { void *p; ngx_fd_t fd; fd = open("/dev/zero", O_RDWR); if (fd == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "open(/dev/zero) failed"); return NULL; } p = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if (p == MAP_FAILED) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "mmap(/dev/zero, MAP_SHARED, %uz) failed", size); p = NULL; } if (close(fd) == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "close() failed"); } return p; } #elif (HAVE_SYSVSHM) #include <sys/ipc.h> #include <sys/shm.h> void *ngx_create_shared_memory(size_t size, ngx_log_t *log) { int id; void *p; id = shmget(IPC_PRIVATE, size, (SHM_R|SHM_W|IPC_CREAT)); if (id == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "shmget(%uz) failed", size); return NULL; } ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "shmget id: %d", id); p = shmat(id, NULL, 0); if (p == (void *) -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "shmat() failed"); p = NULL; } if (shmctl(id, IPC_RMID, NULL) == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "shmctl(IPC_RMID) failed"); p = NULL; } return p; } #endif