Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_slab.c @ 682:5cb5db9975ba NGINX_1_3_4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.4 *) Change: the "ipv6only" parameter is now turned on by default for listening IPv6 sockets. *) Feature: the Clang compiler support. *) Bugfix: extra listening sockets might be created. Thanks to Roman Odaisky. *) Bugfix: nginx/Windows might hog CPU if a worker process failed to start. Thanks to Ricardo Villalobos Guevara. *) Bugfix: the "proxy_pass_header", "fastcgi_pass_header", "scgi_pass_header", "uwsgi_pass_header", "proxy_hide_header", "fastcgi_hide_header", "scgi_hide_header", and "uwsgi_hide_header" directives might be inherited incorrectly.
author Igor Sysoev <http://sysoev.ru>
date Tue, 31 Jul 2012 00:00:00 +0400
parents d0f7a625f27c
children 2e8a942c8872
comparison
equal deleted inserted replaced
681:625501f84a6b 682:5cb5db9975ba
43 43
44 #if (NGX_DEBUG_MALLOC) 44 #if (NGX_DEBUG_MALLOC)
45 45
46 #define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size) 46 #define ngx_slab_junk(p, size) ngx_memset(p, 0xA5, size)
47 47
48 #else 48 #elif (NGX_HAVE_DEBUG_MALLOC)
49
50 #if (NGX_HAVE_DEBUG_MALLOC)
51 49
52 #define ngx_slab_junk(p, size) \ 50 #define ngx_slab_junk(p, size) \
53 if (ngx_debug_malloc) ngx_memset(p, 0xA5, size) 51 if (ngx_debug_malloc) ngx_memset(p, 0xA5, size)
54 52
55 #else 53 #else
56 54
57 #define ngx_slab_junk(p, size) 55 #define ngx_slab_junk(p, size)
58
59 #endif
60 56
61 #endif 57 #endif
62 58
63 static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool, 59 static ngx_slab_page_t *ngx_slab_alloc_pages(ngx_slab_pool_t *pool,
64 ngx_uint_t pages); 60 ngx_uint_t pages);