r2785 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-06-24 12:04:48 +0200 (Tue, 24 Jun 2008)
New Revision: 2785

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
Log:
Fix code, so varnish will still start as long as at least one listen
address works.


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2008-06-24 10:04:08 UTC (rev 2784)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2008-06-24 10:04:48 UTC (rev 2785)
@@ -185,20 +185,26 @@
 		if (params->send_timeout != tv_sndtimeo.tv_sec) {
 			need_test = 1;
 			tv_sndtimeo.tv_sec = params->send_timeout;
-			VTAILQ_FOREACH(ls, &heritage.socks, list) 
+			VTAILQ_FOREACH(ls, &heritage.socks, list) {
+				if (ls->sock < 0)
+					continue;
 				AZ(setsockopt(ls->sock, SOL_SOCKET,
 				    SO_SNDTIMEO,
 				    &tv_sndtimeo, sizeof tv_sndtimeo));
+			}
 		}
 #endif
 #ifdef SO_RCVTIMEO_WORKS
 		if (params->sess_timeout != tv_rcvtimeo.tv_sec) {
 			need_test = 1;
 			tv_rcvtimeo.tv_sec = params->sess_timeout;
-			VTAILQ_FOREACH(ls, &heritage.socks, list) 
+			VTAILQ_FOREACH(ls, &heritage.socks, list)  {
+				if (ls->sock < 0)
+					continue;
 				AZ(setsockopt(ls->sock, SOL_SOCKET,
 				    SO_RCVTIMEO,
 				    &tv_rcvtimeo, sizeof tv_rcvtimeo));
+			}
 		}
 #endif
 		i = poll(pfd, heritage.nsocks, 1000);