Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_degradation_module.c @ 670:ad45b044f1e5 NGINX_1_1_19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.19 *) Security: specially crafted mp4 file might allow to overwrite memory locations in a worker process if the ngx_http_mp4_module was used, potentially resulting in arbitrary code execution (CVE-2012-2089). Thanks to Matthew Daley. *) Bugfix: nginx/Windows might be terminated abnormally. Thanks to Vincent Lee. *) Bugfix: nginx hogged CPU if all servers in an upstream were marked as "backup". *) Bugfix: the "allow" and "deny" directives might be inherited incorrectly if they were used with IPv6 addresses. *) Bugfix: the "modern_browser" and "ancient_browser" directives might be inherited incorrectly. *) Bugfix: timeouts might be handled incorrectly on Solaris/SPARC. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Thu, 12 Apr 2012 00:00:00 +0400
parents d0f7a625f27c
children
comparison
equal deleted inserted replaced
669:3f5d0be5ee74 670:ad45b044f1e5
124 124
125 /* 125 /*
126 * ELF/i386 is loaded at 0x08000000, 128M 126 * ELF/i386 is loaded at 0x08000000, 128M
127 * ELF/amd64 is loaded at 0x00400000, 4M 127 * ELF/amd64 is loaded at 0x00400000, 4M
128 * 128 *
129 * use a function address to substract the loading address 129 * use a function address to subtract the loading address
130 */ 130 */
131 131
132 sbrk_size = (size_t) sbrk(0) - ((uintptr_t) ngx_palloc & ~0x3FFFFF); 132 sbrk_size = (size_t) sbrk(0) - ((uintptr_t) ngx_palloc & ~0x3FFFFF);
133 sbrk_time = now; 133 sbrk_time = now;
134 log = 1; 134 log = 1;