Give vcl_discard() valid return-actions "keep" and "discard".

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1561 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/vcl_returns.h b/varnish-cache/include/vcl_returns.h
index 009cc3fb5f064f18b0d6ab52f27e3a116da7f936..848ec6aceabce40b836b87753d9289f06e60618d 100644 (file)
--- a/varnish-cache/include/vcl_returns.h
+++ b/varnish-cache/include/vcl_returns.h
@@ -18,6 +18,7 @@ VCL_RET_MAC(fetch, FETCH, (1 << 5), 5)
 VCL_RET_MAC(insert, INSERT, (1 << 6), 6)
 VCL_RET_MAC(deliver, DELIVER, (1 << 7), 7)
 VCL_RET_MAC(discard, DISCARD, (1 << 8), 8)
+VCL_RET_MAC(keep, KEEP, (1 << 9), 9)
 #else
 #define VCL_RET_ERROR  (1 << 0)
 #define VCL_RET_LOOKUP  (1 << 1)
@@ -28,7 +29,8 @@ VCL_RET_MAC(discard, DISCARD, (1 << 8), 8)
 #define VCL_RET_INSERT  (1 << 6)
 #define VCL_RET_DELIVER  (1 << 7)
 #define VCL_RET_DISCARD  (1 << 8)
-#define VCL_RET_MAX 9
+#define VCL_RET_KEEP  (1 << 9)
+#define VCL_RET_MAX 10
 #endif
 
 #ifdef VCL_MET_MAC
@@ -40,7 +42,7 @@ VCL_MET_MAC(miss,MISS,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_FETCH))
 VCL_MET_MAC(hit,HIT,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_DELIVER))
 VCL_MET_MAC(fetch,FETCH,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_INSERT))
 VCL_MET_MAC(timeout,TIMEOUT,(VCL_RET_FETCH|VCL_RET_DISCARD))
-VCL_MET_MAC(discard,DISCARD,(VCL_RET_DISCARD|VCL_RET_PASS))
+VCL_MET_MAC(discard,DISCARD,(VCL_RET_DISCARD|VCL_RET_KEEP))
 #else
 #define VCL_MET_RECV   (1 << 0)
 #define VCL_MET_PIPE   (1 << 1)

diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c
index e2b17b776e6a8d1b79a79b3195af93a264f6b5d0..b144b98279decec423a98b6e47e3dcde6899a9fc 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c
@@ -309,6 +309,7 @@ vcl_output_lang_h(struct vsb *sb)
        vsb_cat(sb, "#define VCL_RET_INSERT  (1 << 6)\n");
        vsb_cat(sb, "#define VCL_RET_DELIVER  (1 << 7)\n");
        vsb_cat(sb, "#define VCL_RET_DISCARD  (1 << 8)\n");
+       vsb_cat(sb, "#define VCL_RET_KEEP  (1 << 9)\n");
        vsb_cat(sb, "/*\n");
        vsb_cat(sb, " * $Id$\n");
        vsb_cat(sb, " *\n");
@@ -482,6 +483,12 @@ vcl_output_lang_h(struct vsb *sb)
        vsb_cat(sb, "void VRT_l_obj_cacheable(struct sess *, unsigned);\n");
        vsb_cat(sb, "double VRT_r_obj_ttl(struct sess *);\n");
        vsb_cat(sb, "void VRT_l_obj_ttl(struct sess *, double);\n");
+       vsb_cat(sb, "const char * VRT_r_resp_proto(struct sess *);\n");
+       vsb_cat(sb, "void VRT_l_resp_proto(struct sess *, const char *);\n");
+       vsb_cat(sb, "int VRT_r_resp_status(struct sess *);\n");
+       vsb_cat(sb, "void VRT_l_resp_status(struct sess *, int);\n");
+       vsb_cat(sb, "const char * VRT_r_resp_response(struct sess *);\n");
+       vsb_cat(sb, "void VRT_l_resp_response(struct sess *, const char *);\n");
        vsb_cat(sb, "const char * VRT_r_resp_http_(struct sess *);\n");
        vsb_cat(sb, "void VRT_l_resp_http_(struct sess *, const char *);\n");
 }

diff --git a/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl b/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
index 8c2d69771ef4ddd737fc84c7a3efcd50c62adcdd..7657dd1a78a7a896005bce6132e6fe50cfe3748a 100755 (executable)
--- a/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
@@ -42,7 +42,7 @@ set methods {
        {hit            {error pass deliver}}
        {fetch          {error pass insert}}
        {timeout        {fetch discard}}
-       {discard        {discard pass}}
+       {discard        {discard keep}}
 }
 
 # These are the return actions
@@ -57,6 +57,7 @@ set returns {
        insert
        deliver
        discard
+       keep
 }
 
 # Language keywords