Mercurial > hg > nginx-ranges
comparison src/os/unix/ngx_posix_init.c @ 635:e67b227c8dbb default tip
Merge with current.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 25 Apr 2011 04:07:55 +0400 |
| parents | 428c6e58046a |
| children |
comparison
equal
deleted
inserted
replaced
| 578:f3a9e57d2e17 | 635:e67b227c8dbb |
|---|---|
| 58 return NGX_ERROR; | 58 return NGX_ERROR; |
| 59 } | 59 } |
| 60 | 60 |
| 61 ngx_max_sockets = (ngx_int_t) rlmt.rlim_cur; | 61 ngx_max_sockets = (ngx_int_t) rlmt.rlim_cur; |
| 62 | 62 |
| 63 #if (NGX_HAVE_INHERITED_NONBLOCK) | 63 #if (NGX_HAVE_INHERITED_NONBLOCK || NGX_HAVE_ACCEPT4) |
| 64 ngx_inherited_nonblocking = 1; | 64 ngx_inherited_nonblocking = 1; |
| 65 #else | 65 #else |
| 66 ngx_inherited_nonblocking = 0; | 66 ngx_inherited_nonblocking = 0; |
| 67 #endif | 67 #endif |
| 68 | 68 |