comparison src/os/unix/ngx_posix_init.c @ 646:09a689c5e494 NGINX_1_0_13

nginx 1.0.13 *) Feature: the "return" and "error_page" directives can now be used to return 307 redirections. *) Bugfix: a segmentation fault might occur in a worker process if the "resolver" directive was used and there was no "error_log" directive specified at global level. Thanks to Roman Arutyunyan. *) Bugfix: memory leaks. Thanks to Lanshun Zhou. *) Bugfix: nginx might log incorrect error "upstream prematurely closed connection" instead of correct "upstream sent too big header" one. Thanks to Feibo Li. *) Bugfix: on ZFS filesystem disk cache size might be calculated incorrectly; the bug had appeared in 1.0.1. *) Bugfix: the number of internal redirects to named locations was not limited. *) Bugfix: temporary files might be not removed if the "proxy_store" directive was used with SSI includes. *) Bugfix: in some cases non-cacheable variables (such as the $args variable) returned old empty cached value. *) Bugfix: the "proxy_redirect" directives might be inherited incorrectly. *) Bugfix: nginx could not be built with the ngx_http_perl_module if the --with-openssl option was used. *) Bugfix: nginx could not be built by the icc 12.1 compiler.
author Igor Sysoev <http://sysoev.ru>
date Mon, 05 Mar 2012 00:00:00 +0400
parents ad25218fd14b
children
comparison
equal deleted inserted replaced
645:60344e6faa47 646:09a689c5e494
45 ngx_pagesize = getpagesize(); 45 ngx_pagesize = getpagesize();
46 ngx_cacheline_size = NGX_CPU_CACHE_LINE; 46 ngx_cacheline_size = NGX_CPU_CACHE_LINE;
47 47
48 for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ } 48 for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ }
49 49
50 #if (NGX_HAVE_SC_NPROCESSORS_ONLN)
50 if (ngx_ncpu == 0) { 51 if (ngx_ncpu == 0) {
52 ngx_ncpu = sysconf(_SC_NPROCESSORS_ONLN);
53 }
54 #endif
55
56 if (ngx_ncpu < 1) {
51 ngx_ncpu = 1; 57 ngx_ncpu = 1;
52 } 58 }
53 59
54 ngx_cpuinfo(); 60 ngx_cpuinfo();
55 61