From: Piotr Sikora <piotr@cloudflare.com>
Date: Thu, 24 Oct 2013 21:18:37 +0000 (-0700)
Subject: Core: apply missed options to sockets added during binary upgrade.
X-Git-Tag: release-1.5.7~13
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=475832834bc1ddd53011fee737be51ac24fb2ce8;p=nginx.git

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>
---

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
             }
         }