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

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 11:33:41 +0100 (Fri, 06 Feb 2009)
New Revision: 3646

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c
Log:
Merge r3446: Always release WRW, also on error.



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c	2009-02-06 10:28:54 UTC (rev 3645)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c	2009-02-06 10:33:41 UTC (rev 3646)
@@ -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__);
 	}