Mercurial > hg > nginx-vendor-1-0
annotate src/os/unix/ngx_alloc.c @ 644:ad25218fd14b NGINX_1_0_12
nginx 1.0.12
*) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the
"ssl_protocols" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: in AIO error handling on FreeBSD.
*) Bugfix: in the OpenSSL library initialization.
*) Bugfix: the "worker_cpu_affinity" directive might not work.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter
did not return answer from cache if there were no live upstreams.
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
*) Bugfix: in error handling while connecting to a backend.
Thanks to Piotr Sikora.
*) Bugfix: in the "epoll" event method.
Thanks to Yichun Zhang.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.0.11.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 06 Feb 2012 00:00:00 +0400 |
parents | ab7d265273ed |
children |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
644 | 4 * Copyright (C) Nginx, Inc. |
0 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 | |
11 | |
258 | 12 ngx_uint_t ngx_pagesize; |
13 ngx_uint_t ngx_pagesize_shift; | |
138 | 14 ngx_uint_t ngx_cacheline_size; |
0 | 15 |
16 | |
50 | 17 void * |
18 ngx_alloc(size_t size, ngx_log_t *log) | |
0 | 19 { |
20 void *p; | |
21 | |
50 | 22 p = malloc(size); |
23 if (p == NULL) { | |
0 | 24 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, |
546 | 25 "malloc(%uz) failed", size); |
0 | 26 } |
27 | |
10 | 28 ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %p:%uz", p, size); |
0 | 29 |
30 return p; | |
31 } | |
32 | |
33 | |
50 | 34 void * |
35 ngx_calloc(size_t size, ngx_log_t *log) | |
0 | 36 { |
37 void *p; | |
38 | |
39 p = ngx_alloc(size, log); | |
40 | |
41 if (p) { | |
42 ngx_memzero(p, size); | |
43 } | |
44 | |
45 return p; | |
46 } | |
47 | |
48 | |
18 | 49 #if (NGX_HAVE_POSIX_MEMALIGN) |
0 | 50 |
50 | 51 void * |
52 ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) | |
0 | 53 { |
54 void *p; | |
546 | 55 int err; |
0 | 56 |
546 | 57 err = posix_memalign(&p, alignment, size); |
58 | |
59 if (err) { | |
60 ngx_log_error(NGX_LOG_EMERG, log, err, | |
61 "posix_memalign(%uz, %uz) failed", alignment, size); | |
62 p = NULL; | |
0 | 63 } |
64 | |
548 | 65 ngx_log_debug3(NGX_LOG_DEBUG_ALLOC, log, 0, |
546 | 66 "posix_memalign: %p:%uz @%uz", p, size, alignment); |
0 | 67 |
68 return p; | |
69 } | |
70 | |
18 | 71 #elif (NGX_HAVE_MEMALIGN) |
0 | 72 |
50 | 73 void * |
74 ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) | |
0 | 75 { |
76 void *p; | |
77 | |
50 | 78 p = memalign(alignment, size); |
79 if (p == NULL) { | |
0 | 80 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, |
546 | 81 "memalign(%uz, %uz) failed", alignment, size); |
0 | 82 } |
83 | |
548 | 84 ngx_log_debug3(NGX_LOG_DEBUG_ALLOC, log, 0, |
546 | 85 "memalign: %p:%uz @%uz", p, size, alignment); |
0 | 86 |
87 return p; | |
88 } | |
89 | |
90 #endif |