Mercurial > hg > nginx-vendor-current
annotate src/os/unix/ngx_alloc.c @ 112:408f195b3482 NGINX_0_3_3
nginx 0.3.3
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; bug appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Wed, 19 Oct 2005 00:00:00 +0400 |
| parents | 72eb30262aac |
| children | 8e6d4d96ec4c |
| rev | line source |
|---|---|
| 0 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 | |
| 10 | |
| 11 int ngx_pagesize; | |
| 12 | |
| 13 | |
| 50 | 14 void * |
| 15 ngx_alloc(size_t size, ngx_log_t *log) | |
| 0 | 16 { |
| 17 void *p; | |
| 18 | |
| 50 | 19 p = malloc(size); |
| 20 if (p == NULL) { | |
| 0 | 21 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, |
| 10 | 22 "malloc() %uz bytes failed", size); |
| 0 | 23 } |
| 24 | |
| 10 | 25 ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %p:%uz", p, size); |
| 0 | 26 |
| 27 return p; | |
| 28 } | |
| 29 | |
| 30 | |
| 50 | 31 void * |
| 32 ngx_calloc(size_t size, ngx_log_t *log) | |
| 0 | 33 { |
| 34 void *p; | |
| 35 | |
| 36 p = ngx_alloc(size, log); | |
| 37 | |
| 38 if (p) { | |
| 39 ngx_memzero(p, size); | |
| 40 } | |
| 41 | |
| 42 return p; | |
| 43 } | |
| 44 | |
| 45 | |
| 18 | 46 #if (NGX_HAVE_POSIX_MEMALIGN) |
| 0 | 47 |
| 50 | 48 void * |
| 49 ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) | |
| 0 | 50 { |
| 51 void *p; | |
| 52 | |
| 53 if (posix_memalign(&p, alignment, size) == -1) { | |
| 54 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, | |
| 10 | 55 "posix_memalign() %uz bytes aligned to %uz failed", |
| 56 size, alignment); | |
| 0 | 57 } |
| 58 | |
| 59 ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, | |
| 10 | 60 "posix_memalign: %p:%uz", p, size); |
| 0 | 61 |
| 62 return p; | |
| 63 } | |
| 64 | |
| 18 | 65 #elif (NGX_HAVE_MEMALIGN) |
| 0 | 66 |
| 50 | 67 void * |
| 68 ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) | |
| 0 | 69 { |
| 70 void *p; | |
| 71 | |
| 50 | 72 p = memalign(alignment, size); |
| 73 if (p == NULL) { | |
| 0 | 74 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, |
| 10 | 75 "memalign() %uz bytes aligned to %uz failed", |
| 76 size, alignment); | |
| 0 | 77 } |
| 78 | |
| 79 ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, | |
| 10 | 80 "memalign: %p:%uz", p, size); |
| 0 | 81 |
| 82 return p; | |
| 83 } | |
| 84 | |
| 85 #endif |