[master] 29313f1 Always close the VFP stack, also on BS_NONE.

[Poul-Henning Kamp]

commit 29313f17d58cd36e8926103316ad4e866e195527
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Feb 26 17:13:42 2016 +0000

    Always close the VFP stack, also on BS_NONE.
    
    Fixes:	#1860

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 6067324..a7dcc51 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -523,8 +523,6 @@ vbf_fetch_body_helper(struct busyobj *bo)
 		}
 	} while (vfps == VFP_OK);
 
-	VFP_Close(vfc);
-
 	if (vfps == VFP_ERROR) {
 		AN(vfc->failed);
 		(void)VFP_Error(vfc, "Fetch pipeline failed to process");
@@ -686,6 +684,8 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 		vbf_fetch_body_helper(bo);
 	}
 
+	VFP_Close(bo->vfc);
+
 	if (bo->vfc->failed) {
 		VDI_Finish(bo->wrk, bo);
 		if (!bo->do_stream) {