diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 13:06:45 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 13:06:45 +0000 |
| commit | 6692bd213c3029fb45933e139d001f6a315c5197 (patch) | |
| tree | cd5de286cd6c8c01023ea543c3f1fee820b9d9e0 /src/os/unix/ngx_freebsd_init.c | |
| parent | ed89c54f991b19826d33dfce22826db1b7b391cf (diff) | |
| download | nginx-6692bd213c3029fb45933e139d001f6a315c5197.tar.gz nginx-6692bd213c3029fb45933e139d001f6a315c5197.tar.bz2 | |
Merge of r4227, r4228:
Fixed range checking for the "somaxconn" sysctl. Fixed port range checking.
Diffstat (limited to 'src/os/unix/ngx_freebsd_init.c')
| -rw-r--r-- | src/os/unix/ngx_freebsd_init.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c index 1211c7ccb..2fa222dac 100644 --- a/src/os/unix/ngx_freebsd_init.c +++ b/src/os/unix/ngx_freebsd_init.c @@ -97,7 +97,7 @@ ngx_debug_init() ngx_int_t ngx_os_specific_init(ngx_log_t *log) { - int version, somaxconn; + int version; size_t size; ngx_err_t err; ngx_uint_t i; @@ -209,12 +209,9 @@ ngx_os_specific_init(ngx_log_t *log) ngx_ncpu = ngx_freebsd_hw_ncpu; } - somaxconn = version < 600008 ? 32676 : 65535; - - if (ngx_freebsd_kern_ipc_somaxconn > somaxconn) { + if (version < 600008 && ngx_freebsd_kern_ipc_somaxconn > 32767) { ngx_log_error(NGX_LOG_ALERT, log, 0, - "sysctl kern.ipc.somaxconn must be no more than %d", - somaxconn); + "sysctl kern.ipc.somaxconn must be less than 32768"); return NGX_ERROR; } |