r3682 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 15:41:34 +0100 (Fri, 06 Feb 2009)
New Revision: 3682

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_session.c
Log:
Merge r3493:
Remove pointless initialization.

Fix indentation.



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_session.c	2009-02-06 14:37:50 UTC (rev 3681)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_session.c	2009-02-06 14:41:34 UTC (rev 3682)
@@ -382,7 +382,7 @@
 void
 SES_InheritBackendTimeouts(struct sess *sp)
 {
-	struct backend *be = NULL;
+	struct backend *be;
 
 	AN(sp);
 	AN(sp->vbe);
@@ -395,13 +395,12 @@
 	 * is parameter < backend definition < VCL.
 	 */
 	if (be->connect_timeout > 1e-3 && 
-			sp->connect_timeout == params->connect_timeout)
+	    sp->connect_timeout == params->connect_timeout)
 		sp->connect_timeout = be->connect_timeout;
 	if (be->first_byte_timeout > 1e-3 && 
-			sp->first_byte_timeout == params->first_byte_timeout)
+	    sp->first_byte_timeout == params->first_byte_timeout)
 		sp->first_byte_timeout = be->first_byte_timeout;
-	if (be->between_bytes_timeout > 1e-3 
-			&& sp->between_bytes_timeout == params->between_bytes_timeout)
+	if (be->between_bytes_timeout > 1e-3 &&
+	    sp->between_bytes_timeout == params->between_bytes_timeout)
 		sp->between_bytes_timeout = be->between_bytes_timeout;
 }
-