Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_palloc.c @ 390:0b6053502c55 NGINX_0_7_7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.7 *) Change: now the EAGAIN error returned by connect() is not considered as temporary error. *) Change: now the $ssl_client_cert variable value is a certificate with TAB character intended before each line except first one; an unchanged certificate is available in the $ssl_client_raw_cert variable. *) Feature: the "ask" parameter in the "ssl_verify_client" directive. *) Feature: byte-range processing improvements. Thanks to Maxim Dounin. *) Feature: the "directio" directive. *) Feature: MacOSX 1.5 sendfile() support. *) Bugfix: now in MacOSX and Cygwin locations are tested in case insensitive mode; however, the compare is provided by single-byte locales only. *) Bugfix: mail proxy SSL connections hanged, if select, poll, or /dev/poll methods were used. *) Bugfix: UTF-8 encoding usage in the ngx_http_autoindex_module.
author Igor Sysoev <http://sysoev.ru>
date Wed, 30 Jul 2008 00:00:00 +0400
parents 984bb0b1399b
children b4f69f2ef02c
comparison
equal deleted inserted replaced
389:930e48a26dde 390:0b6053502c55
193 ngx_palloc_large(ngx_pool_t *pool, size_t size) 193 ngx_palloc_large(ngx_pool_t *pool, size_t size)
194 { 194 {
195 void *p; 195 void *p;
196 ngx_pool_large_t *large; 196 ngx_pool_large_t *large;
197 197
198 #if 0
199 p = ngx_memalign(ngx_pagesize, size, pool->log);
200 if (p == NULL) {
201 return NULL;
202 }
203 #else
204 p = ngx_alloc(size, pool->log); 198 p = ngx_alloc(size, pool->log);
205 if (p == NULL) { 199 if (p == NULL) {
206 return NULL; 200 return NULL;
207 } 201 }
208 #endif 202
203 large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
204 if (large == NULL) {
205 ngx_free(p);
206 return NULL;
207 }
208
209 large->alloc = p;
210 large->next = pool->large;
211 pool->large = large;
212
213 return p;
214 }
215
216
217 void *
218 ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment)
219 {
220 void *p;
221 ngx_pool_large_t *large;
222
223 p = ngx_memalign(alignment, size, pool->log);
224 if (p == NULL) {
225 return NULL;
226 }
209 227
210 large = ngx_palloc(pool, sizeof(ngx_pool_large_t)); 228 large = ngx_palloc(pool, sizeof(ngx_pool_large_t));
211 if (large == NULL) { 229 if (large == NULL) {
212 ngx_free(p); 230 ngx_free(p);
213 return NULL; 231 return NULL;