Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_alloc.c @ 676:bfa81a0490a2 NGINX_1_3_1
nginx 1.3.1
*) Security: now nginx/Windows ignores trailing dot in URI path
component, and does not allow URIs with ":$" in it.
Thanks to Vladimir Kochetkov, Positive Research Center.
*) Feature: the "proxy_pass", "fastcgi_pass", "scgi_pass", "uwsgi_pass"
directives, and the "server" directive inside the "upstream" block,
now support IPv6 addresses.
*) Feature: the "resolver" directive now support IPv6 addresses and an
optional port specification.
*) Feature: the "least_conn" directive inside the "upstream" block.
*) Feature: it is now possible to specify a weight for servers while
using the "ip_hash" directive.
*) Bugfix: a segmentation fault might occur in a worker process if the
"image_filter" directive was used; the bug had appeared in 1.3.0.
*) Bugfix: nginx could not be built with ngx_cpp_test_module; the bug
had appeared in 1.1.12.
*) Bugfix: access to variables from SSI and embedded perl module might
not work after reconfiguration.
Thanks to Yichun Zhang.
*) Bugfix: in the ngx_http_xslt_filter_module.
Thanks to Kuramoto Eiji.
*) Bugfix: memory leak if $geoip_org variable was used.
Thanks to Denis F. Latypoff.
*) Bugfix: in the "proxy_cookie_domain" and "proxy_cookie_path"
directives.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 05 Jun 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
660 | 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 |