Mercurial > hg > nginx-vendor-1-0

comparison src/os/unix/ngx_darwin_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 ff86d646f9df
children ad25218fd14b
comparison
equal deleted inserted replaced
641:e21c9e01ce08 642:1b80544421e8
56 56
57 57
58 ngx_int_t 58 ngx_int_t
59 ngx_os_specific_init(ngx_log_t *log) 59 ngx_os_specific_init(ngx_log_t *log)
60 { 60 {
61 int somaxconn;
62 size_t size; 61 size_t size;
63 ngx_err_t err; 62 ngx_err_t err;
64 ngx_uint_t i; 63 ngx_uint_t i;
65 64
66 size = sizeof(ngx_darwin_kern_ostype); 65 size = sizeof(ngx_darwin_kern_ostype);
123 return NGX_ERROR; 122 return NGX_ERROR;
124 } 123 }
125 124
126 ngx_ncpu = ngx_darwin_hw_ncpu; 125 ngx_ncpu = ngx_darwin_hw_ncpu;
127 126
128 somaxconn = 32676; 127 if (ngx_darwin_kern_ipc_somaxconn > 32767) {
129
130 if (ngx_darwin_kern_ipc_somaxconn > somaxconn) {
131 ngx_log_error(NGX_LOG_ALERT, log, 0, 128 ngx_log_error(NGX_LOG_ALERT, log, 0,
132 "sysctl kern.ipc.somaxconn must be no more than %d", 129 "sysctl kern.ipc.somaxconn must be less than 32768");
133 somaxconn);
134 return NGX_ERROR; 130 return NGX_ERROR;
135 } 131 }
136 132
137 ngx_tcp_nodelay_and_tcp_nopush = 1; 133 ngx_tcp_nodelay_and_tcp_nopush = 1;
138 134