r3446 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-11-26 17:10:19 +0100 (Wed, 26 Nov 2008)
New Revision: 3446

Modified:
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
Log:
Always release WRW, also on error.



Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2008-11-26 12:05:44 UTC (rev 3445)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2008-11-26 16:10:19 UTC (rev 3446)
@@ -353,13 +353,8 @@
 
 	/* Deal with any message-body the request might have */
 	i = FetchReqBody(sp);
-	if (i > 0) {
+	if (WRW_FlushRelease(w) || i > 0) {
 		VBE_ClosedFd(sp);
-		return (__LINE__);
-	}
-
-	if (WRW_FlushRelease(w)) {
-		VBE_ClosedFd(sp);
 		/* XXX: other cleanup ? */
 		return (__LINE__);
 	}