Mercurial > hg > nginx-vendor-0-7
annotate src/os/unix/ngx_shmem.c @ 502:89dc5654117c NGINX_0_7_63
nginx 0.7.63
*) Security: now "/../" are disabled in "Destination" request header
line.
*) Change: minimum supported OpenSSL version is 0.9.7.
*) Change: the "ask" parameter of the "ssl_verify_client" directive was
changed to the "optional" parameter and now it checks a client
certificate if it was offered.
Thanks to Brice Figureau.
*) Feature: now the "-V" switch shows TLS SNI support.
*) Feature: the $ssl_client_verify variable.
Thanks to Brice Figureau.
*) Feature: the "ssl_crl" directive.
Thanks to Brice Figureau.
*) Bugfix: the $ssl_client_cert variable usage corrupted memory; the
bug had appeared in 0.7.7.
Thanks to Sergey Zhuravlev.
*) Feature: now the start cache loader runs in a separate process; this
should improve large caches handling.
*) Feature: now temporary files and permanent storage area may reside
at different file systems.
*) Bugfix: nginx counted incorrectly disk cache size.
*) Change: now directive "gzip_disable msie6" does not disable gzipping
for MSIE 6.0 SV1.
*) Bugfix: nginx always added "Vary: Accept-Encoding" response header
line, if both "gzip_static" and "gzip_vary" were on.
*) Feature: the "proxy" parameter of the "geo" directive.
*) Feature: the ngx_http_geoip_module.
*) Feature: the "limit_rate_after" directive.
Thanks to Ivan Debnar.
*) Feature: the "limit_req_log_level" and "limit_conn_log_level"
directives.
*) Bugfix: now "limit_req" directive conforms to the leaky bucket
algorithm.
Thanks to Maxim Dounin.
*) Bugfix: in ngx_http_limit_req_module.
Thanks to Maxim Dounin.
*) Bugfix: now nginx allows underscores in a request method.
*) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did
not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate",
"X-Accel-Buffering", and "X-Accel-Charset" lines from backend
response header.
Thanks to Maxim Dounin.
*) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend
response header lines; the bug had appeared in 0.7.44.
Thanks to Maxim Dounin.
*) Feature: the "image_filter_transparency" directive.
*) Feature: the "image_filter" directive supports variables for setting
size.
*) Bugfix: in PNG alpha-channel support in the
ngx_http_image_filter_module.
*) Bugfix: in transparency support in the ngx_http_image_filter_module.
*) Feature: now several "perl_modules" directives may be used.
*) Bugfix: ngx_http_perl_module responses did not work in subrequests.
*) Bugfix: nginx sent '\0' in a "Location" response header line on
MKCOL request.
Thanks to Xie Zhenye.
*) Bugfix: an "error_page" directive did not redirect a 413 error; the
bug had appeared in 0.6.10.
*) Bugfix: in memory allocation error handling.
Thanks to Maxim Dounin and Kirill A. Korinskiy.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 00:00:00 +0300 |
parents | af37b7cb6698 |
children |
rev | line source |
---|---|
154 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 #if (NGX_HAVE_MAP_ANON) | |
12 | |
13 ngx_int_t | |
14 ngx_shm_alloc(ngx_shm_t *shm) | |
15 { | |
188 | 16 shm->addr = (u_char *) mmap(NULL, shm->size, |
17 PROT_READ|PROT_WRITE, | |
18 MAP_ANON|MAP_SHARED, -1, 0); | |
154 | 19 |
20 if (shm->addr == MAP_FAILED) { | |
21 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
22 "mmap(MAP_ANON|MAP_SHARED, %uz) failed", shm->size); | |
23 return NGX_ERROR; | |
24 } | |
25 | |
26 return NGX_OK; | |
27 } | |
28 | |
29 | |
30 void | |
31 ngx_shm_free(ngx_shm_t *shm) | |
32 { | |
188 | 33 if (munmap((void *) shm->addr, shm->size) == -1) { |
154 | 34 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, |
35 "munmap(%p, %uz) failed", shm->addr, shm->size); | |
36 } | |
37 } | |
38 | |
39 #elif (NGX_HAVE_MAP_DEVZERO) | |
40 | |
41 ngx_int_t | |
42 ngx_shm_alloc(ngx_shm_t *shm) | |
43 { | |
44 ngx_fd_t fd; | |
45 | |
46 fd = open("/dev/zero", O_RDWR); | |
47 | |
48 if (fd == -1) { | |
49 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
50 "open(\"/dev/zero\") failed"); | |
51 return NGX_ERROR; | |
52 } | |
53 | |
188 | 54 shm->addr = (u_char *) mmap(NULL, shm->size, PROT_READ|PROT_WRITE, |
55 MAP_SHARED, fd, 0); | |
154 | 56 |
57 if (shm->addr == MAP_FAILED) { | |
58 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
59 "mmap(/dev/zero, MAP_SHARED, %uz) failed", shm->size); | |
60 } | |
61 | |
62 if (close(fd) == -1) { | |
63 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
64 "close(\"/dev/zero\") failed"); | |
65 } | |
66 | |
67 return (shm->addr == MAP_FAILED) ? NGX_ERROR : NGX_OK; | |
68 } | |
69 | |
70 | |
71 void | |
72 ngx_shm_free(ngx_shm_t *shm) | |
73 { | |
188 | 74 if (munmap((void *) shm->addr, shm->size) == -1) { |
154 | 75 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, |
76 "munmap(%p, %uz) failed", shm->addr, shm->size); | |
77 } | |
78 } | |
79 | |
80 #elif (NGX_HAVE_SYSVSHM) | |
81 | |
82 #include <sys/ipc.h> | |
83 #include <sys/shm.h> | |
84 | |
85 | |
86 ngx_int_t | |
87 ngx_shm_alloc(ngx_shm_t *shm) | |
88 { | |
89 int id; | |
90 | |
91 id = shmget(IPC_PRIVATE, shm->size, (SHM_R|SHM_W|IPC_CREAT)); | |
92 | |
93 if (id == -1) { | |
94 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
95 "shmget(%uz) failed", shm->size); | |
96 return NGX_ERROR; | |
97 } | |
98 | |
99 ngx_log_debug1(NGX_LOG_DEBUG_CORE, shm->log, 0, "shmget id: %d", id); | |
100 | |
101 shm->addr = shmat(id, NULL, 0); | |
102 | |
103 if (shm->addr == (void *) -1) { | |
104 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, "shmat() failed"); | |
105 } | |
106 | |
107 if (shmctl(id, IPC_RMID, NULL) == -1) { | |
108 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
109 "shmctl(IPC_RMID) failed"); | |
110 } | |
111 | |
112 return (shm->addr == (void *) -1) ? NGX_ERROR : NGX_OK; | |
113 } | |
114 | |
115 | |
116 void | |
117 ngx_shm_free(ngx_shm_t *shm) | |
118 { | |
119 if (shmdt(shm->addr) == -1) { | |
120 ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno, | |
121 "shmdt(%p) failed", shm->addr); | |
122 } | |
123 } | |
124 | |
125 #endif |