commit 92edf47ff998f174bab2d99c26f59991def2aa4e
author Valentin Bartenev <vbart@nginx.com> Mon Dec 05 08:06:15 2011 +0000
committer Valentin Bartenev <vbart@nginx.com> Mon Dec 05 08:06:15 2011 +0000
tree 6e514194ae2b9d4f43da303fe30d8ce6962e928b
parent 1ea2eb56ef2e26873b71c951b34f5cb98c0a2c53

Added the "so_keepalive=" parameter to the "listen" directive.
The "so_keepalive" directive in mail module was deprecated.

Thanks to Vsevolod Stakhov for initial work.

src/http/ngx_http.c

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 1eb22f8..e10dbc8 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1762,6 +1762,13 @@
     ls->rcvbuf = addr->opt.rcvbuf;
     ls->sndbuf = addr->opt.sndbuf;
 
+    ls->keepalive = addr->opt.so_keepalive;
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+    ls->keepidle = addr->opt.tcp_keepidle;
+    ls->keepintvl = addr->opt.tcp_keepintvl;
+    ls->keepcnt = addr->opt.tcp_keepcnt;
+#endif
+
 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
     ls->accept_filter = addr->opt.accept_filter;
 #endif