Mercurial > hg > nginx
comparison src/os/unix/ngx_darwin_init.c @ 4353:710e35d17c28 stable-1.0
Merge of r4227, r4228:
Fixed range checking for the "somaxconn" sysctl. Fixed port range checking.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 14 Dec 2011 13:06:45 +0000 |
parents | 22b05d177dc6 |
children | 4919fb357a5d |
comparison
equal
deleted
inserted
replaced
4352:413b822f1efa | 4353:710e35d17c28 |
---|---|
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 |