Mercurial > hg > nginx-vendor-1-0

comparison src/os/unix/ngx_freebsd_init.c @ 642:1b80544421e8 NGINX_1_0_11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.11 *) Change: now double quotes are encoded in an "echo" SSI-command output. Thanks to Zaur Abasmirzoev. *) Feature: the "image_filter_sharpen" directive. *) Bugfix: a segmentation fault might occur in a worker process if SNI was used; the bug had appeared in 1.0.9. *) Bugfix: SIGWINCH signal did not work after first binary upgrade; the bug had appeared in 1.0.9. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines might be passed to backend while caching; or not passed without caching if caching was enabled in another part of the configuration. *) Bugfix: in the "scgi_param" directive, if complex parameters were used. *) Bugfix: "add_header" and "expires" directives did not work if a request was proxied and response status code was 206. *) Bugfix: in the "expires @time" directive. *) Bugfix: in the ngx_http_flv_module. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on FreeBSD 10. *) Bugfix: nginx could not be built on AIX.
author Igor Sysoev <http://sysoev.ru>
date Thu, 15 Dec 2011 00:00:00 +0400
parents fd759445d8a8
children ad25218fd14b
comparison
equal deleted inserted replaced
641:e21c9e01ce08 642:1b80544421e8
95 95
96 96
97 ngx_int_t 97 ngx_int_t
98 ngx_os_specific_init(ngx_log_t *log) 98 ngx_os_specific_init(ngx_log_t *log)
99 { 99 {
100 int version, somaxconn; 100 int version;
101 size_t size; 101 size_t size;
102 ngx_err_t err; 102 ngx_err_t err;
103 ngx_uint_t i; 103 ngx_uint_t i;
104 104
105 size = sizeof(ngx_freebsd_kern_ostype); 105 size = sizeof(ngx_freebsd_kern_ostype);
207 207
208 } else { 208 } else {
209 ngx_ncpu = ngx_freebsd_hw_ncpu; 209 ngx_ncpu = ngx_freebsd_hw_ncpu;
210 } 210 }
211 211
212 somaxconn = version < 600008 ? 32676 : 65535; 212 if (version < 600008 && ngx_freebsd_kern_ipc_somaxconn > 32767) {
213
214 if (ngx_freebsd_kern_ipc_somaxconn > somaxconn) {
215 ngx_log_error(NGX_LOG_ALERT, log, 0, 213 ngx_log_error(NGX_LOG_ALERT, log, 0,
216 "sysctl kern.ipc.somaxconn must be no more than %d", 214 "sysctl kern.ipc.somaxconn must be less than 32768");
217 somaxconn);
218 return NGX_ERROR; 215 return NGX_ERROR;
219 } 216 }
220 217
221 ngx_tcp_nodelay_and_tcp_nopush = 1; 218 ngx_tcp_nodelay_and_tcp_nopush = 1;
222 219