[master] 9552aa1 Retire fetch return option from vcl_hit{}

[Federico G. Schwindt]

commit 9552aa16b46b38b0b3eb7ac42f3bc6295f50eecc
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu May 5 15:32:08 2016 +0100

    Retire fetch return option from vcl_hit{}
    
    This has been superseded by return (miss).

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 889cf40..72f24a7 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -439,10 +439,6 @@ cnt_lookup(struct worker *wrk, struct req *req)
 		req->is_hit = 1;
 		req->req_step = R_STP_DELIVER;
 		return (REQ_FSM_MORE);
-	case VCL_RET_FETCH:
-		VSLb(req->vsl, SLT_VCL_Error,
-		    "change return(fetch) to return(miss) in vcl_hit{}");
-		/* FALL-THROUGH */
 	case VCL_RET_MISS:
 		if (busy != NULL) {
 			req->objcore = busy;
diff --git a/bin/varnishtest/tests/r01335.vtc b/bin/varnishtest/tests/r01335.vtc
index 85ff372..1488c98 100644
--- a/bin/varnishtest/tests/r01335.vtc
+++ b/bin/varnishtest/tests/r01335.vtc
@@ -10,7 +10,7 @@ server s1 {
 varnish v1 -vcl+backend {
 	sub vcl_hit {
 		if (req.http.two == "2") {
-			return (fetch);		// also #1603
+			return (miss);		// also #1603
 		}
 	}
 } -start
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index e70068c..37aae67 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -109,7 +109,7 @@ returns =(
 	),
 	('hit',
 		"C",
-		('synth', 'restart', 'pass', 'fetch', 'miss', 'deliver',)
+		('synth', 'restart', 'pass', 'miss', 'deliver',)
 	),
 	('deliver',
 		"C",