diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2013-10-24 14:18:37 -0700 |
|---|---|---|
| committer | Piotr Sikora <piotr@cloudflare.com> | 2013-10-24 14:18:37 -0700 |
| commit | 475832834bc1ddd53011fee737be51ac24fb2ce8 (patch) | |
| tree | d2212d9fc240f9dd6c92f6446e0c4982d5c98651 /src/core/ngx_cycle.c | |
| parent | 8f3dfde7f7407053b8ea49917576495b817bb70b (diff) | |
| download | nginx-475832834bc1ddd53011fee737be51ac24fb2ce8.tar.gz nginx-475832834bc1ddd53011fee737be51ac24fb2ce8.tar.bz2 | |
Core: apply missed options to sockets added during binary upgrade.
The accept_filter and deferred options were not applied to sockets
that were added to configuration during binary upgrade cycle.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index eb39ab253..96345192a 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -545,6 +545,16 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) if (nls[n].fd == (ngx_socket_t) -1) { nls[n].open = 1; +#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) + if (nls[n].accept_filter) { + nls[n].add_deferred = 1; + } +#endif +#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) + if (nls[n].deferred_accept) { + nls[n].add_deferred = 1; + } +#endif } } |