r4545 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2010-02-10 11:44:14 +0100 (Wed, 10 Feb 2010)
New Revision: 4545

Modified:
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
Log:
Oops, don't override fetch failure status.



Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2010-02-10 10:35:49 UTC (rev 4544)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2010-02-10 10:44:14 UTC (rev 4545)
@@ -497,10 +497,11 @@
 		mklen = 1;
 	}
 
-	if (http_HdrIs(hp, H_Connection, "close"))
+	if (cls == 0 && http_HdrIs(hp, H_Connection, "close"))
 		cls = 1;
 
-	if (hp->protover < 1.1 && !http_HdrIs(hp, H_Connection, "keep-alive"))
+	if (cls == 0 && hp->protover < 1.1 &&
+	    !http_HdrIs(hp, H_Connection, "keep-alive"))
 		cls = 1;
 
 	if (cls < 0) {