r5713 - in trunk/varnish-cache: bin/varnishd bin/varnishtest/tests lib/libvcl
phk at varnish-cache.org
phk at varnish-cache.org
Tue Jan 11 12:24:39 CET 2011
Author: phk
Date: 2011-01-11 12:24:39 +0100 (Tue, 11 Jan 2011)
New Revision: 5713
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_fetch.c
trunk/varnish-cache/bin/varnishd/cache_gzip.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/cache_vrt_var.c
trunk/varnish-cache/bin/varnishtest/tests/e00000.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00001.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00002.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00003.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00004.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00005.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00007.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00008.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00009.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00010.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00011.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00012.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00014.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00015.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00016.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc
trunk/varnish-cache/bin/varnishtest/tests/e00018.vtc
trunk/varnish-cache/bin/varnishtest/tests/g00002.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00318.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00326.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00345.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00386.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00427.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00445.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00476.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00524.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00590.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00612.vtc
trunk/varnish-cache/bin/varnishtest/tests/r00641.vtc
trunk/varnish-cache/lib/libvcl/generate.py
trunk/varnish-cache/lib/libvcl/vcc_action.c
Log:
Rename the "esi" action to a BOOL variable named beresp.do_esi.
In other words, you need to change
sub vcl_fetch {
esi;
}
to:
sub vcl_fetch {
set beresp.do_esi = true;
}
Add VCL support and skeleton versions of the gzip (beresp.do_gzip)
and gunzip (beresp.do_gunzip) VFP's while here anyway.
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2011-01-11 11:24:39 UTC (rev 5713)
@@ -223,6 +223,9 @@
vfp_end_f *end;
};
+extern struct vfp vfp_gunzip;
+extern struct vfp vfp_gzip;
+
/*--------------------------------------------------------------------*/
struct worker {
@@ -268,7 +271,6 @@
double entered;
double ttl;
double grace;
- unsigned do_esi;
/* This is only here so VRT can find it */
char *storage_hint;
@@ -277,6 +279,9 @@
enum body_status body_status;
struct storage *storage;
struct vfp *vfp;
+ unsigned do_esi;
+ unsigned do_gzip;
+ unsigned do_gunzip;
/* Timeouts */
double connect_timeout;
Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c 2011-01-11 11:24:39 UTC (rev 5713)
@@ -46,7 +46,7 @@
static unsigned fetchfrag;
/*--------------------------------------------------------------------
- * VFP NOOP
+ * VFP_NOP
*
* This fetch-processor does nothing but store the object.
* It also documents the API
Modified: trunk/varnish-cache/bin/varnishd/cache_gzip.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_gzip.c 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishd/cache_gzip.c 2011-01-11 11:24:39 UTC (rev 5713)
@@ -167,3 +167,75 @@
*vg = NULL;
return (0);
}
+
+/*--------------------------------------------------------------------
+ * VFP_GUNZIP
+ *
+ * A VFP for gunzip'ing an object as we receive it from the backend
+ */
+
+static void
+vfp_gunzip_begin(const struct sess *sp, size_t estimate)
+{
+ (void)sp;
+ (void)estimate;
+}
+
+static int
+vfp_gunzip_bytes(const struct sess *sp, struct http_conn *htc, size_t bytes)
+{
+ (void)sp;
+ (void)htc;
+ (void)bytes;
+ return (-1);
+}
+
+static int
+vfp_gunzip_end(const struct sess *sp)
+{
+ (void)sp;
+ return (-1);
+}
+
+struct vfp vfp_gunzip = {
+ .begin = vfp_gunzip_begin,
+ .bytes = vfp_gunzip_bytes,
+ .end = vfp_gunzip_end,
+};
+
+
+/*--------------------------------------------------------------------
+ * VFP_GZIP
+ *
+ * A VFP for gzip'ing an object as we receive it from the backend
+ */
+
+static void
+vfp_gzip_begin(const struct sess *sp, size_t estimate)
+{
+ (void)sp;
+ (void)estimate;
+}
+
+static int
+vfp_gzip_bytes(const struct sess *sp, struct http_conn *htc, size_t bytes)
+{
+ (void)sp;
+ (void)htc;
+ (void)bytes;
+ return (-1);
+}
+
+static int
+vfp_gzip_end(const struct sess *sp)
+{
+ (void)sp;
+ return (-1);
+}
+
+struct vfp vfp_gzip = {
+ .begin = vfp_gzip_begin,
+ .bytes = vfp_gzip_bytes,
+ .end = vfp_gzip_end,
+};
+
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2011-01-11 11:24:39 UTC (rev 5713)
@@ -378,22 +378,6 @@
/*--------------------------------------------------------------------*/
void
-VRT_ESI(const struct sess *sp)
-{
-
- if (sp->cur_method != VCL_MET_FETCH) {
- /* XXX: we should catch this at compile time */
- WSP(sp, SLT_VCL_error,
- "esi can only be called from vcl_fetch");
- return;
- }
-
- sp->wrk->do_esi = 1;
-}
-
-/*--------------------------------------------------------------------*/
-
-void
VRT_panic(const struct sess *sp, const char *str, ...)
{
va_list ap;
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_var.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_var.c 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_var.c 2011-01-11 11:24:39 UTC (rev 5713)
@@ -196,6 +196,9 @@
}
VBERESP(beresp, unsigned, cacheable, cacheable)
+VBERESP(beresp, unsigned, do_esi, do_esi)
+VBERESP(beresp, unsigned, do_gzip, do_gzip)
+VBERESP(beresp, unsigned, do_gunzip, do_gunzip)
/*--------------------------------------------------------------------*/
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00000.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00000.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00000.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -12,7 +12,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00001.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00001.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00001.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -15,7 +15,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start -cliok "param.set esi_syntax 4"
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00002.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00002.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -16,7 +16,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00003.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00003.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00003.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -25,7 +25,7 @@
}
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00004.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00004.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00004.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -20,7 +20,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00005.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00005.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00005.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -21,7 +21,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00006.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -32,7 +32,7 @@
}
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00007.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00007.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00007.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -35,7 +35,7 @@
varnish v1 -storage "-smalloc,2m" -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00008.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00008.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00008.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -60,7 +60,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00009.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00009.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00009.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -23,7 +23,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00010.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00010.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00010.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -15,7 +15,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start -cli "param.set esi_syntax 2"
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00011.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00011.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00011.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -19,7 +19,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
return(pass);
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00012.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00012.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00012.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -20,7 +20,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00013.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -11,7 +11,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00014.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00014.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00014.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -13,7 +13,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00015.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00015.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00015.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -29,7 +29,7 @@
if(req.url == "/") {
set req.esi = false;
}
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00016.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00016.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00016.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -34,7 +34,7 @@
if(req.url == "/body") {
set req.esi = false;
}
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00017.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -74,7 +74,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/e00018.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/e00018.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/e00018.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -39,7 +39,7 @@
return (pass);
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/g00002.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/g00002.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/g00002.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -16,7 +16,7 @@
varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00318.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00318.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00318.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -9,7 +9,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
return(pass);
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00326.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00326.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00326.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -11,7 +11,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00345.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00345.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00345.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -14,7 +14,7 @@
varnish v1 -arg "-p diag_bitmap=0x20" -vcl+backend {
sub vcl_fetch {
if (req.url == "/") {
- esi;
+ set beresp.do_esi = true;
}
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00386.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00386.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00386.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -14,7 +14,7 @@
varnish v1 -arg "-p diag_bitmap=0x20" -vcl+backend {
sub vcl_fetch {
if (req.url == "/") {
- esi;
+ set beresp.do_esi = true;
}
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00427.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00427.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00427.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -27,7 +27,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00433.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -34,7 +34,7 @@
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00445.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00445.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00445.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -13,7 +13,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00476.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00476.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00476.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -19,7 +19,7 @@
varnish v1 -vcl+backend {
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00524.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00524.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00524.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -21,7 +21,7 @@
// return (pass);
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -cliok "param.set sess_timeout 60" -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00590.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00590.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00590.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -63,7 +63,7 @@
return (pass);
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00612.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00612.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00612.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -39,7 +39,7 @@
return (pass);
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -start
Modified: trunk/varnish-cache/bin/varnishtest/tests/r00641.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/r00641.vtc 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/bin/varnishtest/tests/r00641.vtc 2011-01-11 11:24:39 UTC (rev 5713)
@@ -18,7 +18,7 @@
// return (pass);
}
sub vcl_fetch {
- esi;
+ set beresp.do_esi = true;
}
} -cliok "param.set sess_timeout 60" -start
Modified: trunk/varnish-cache/lib/libvcl/generate.py
===================================================================
--- trunk/varnish-cache/lib/libvcl/generate.py 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/lib/libvcl/generate.py 2011-01-11 11:24:39 UTC (rev 5713)
@@ -298,19 +298,19 @@
( 'fetch',),
'const struct sess *'
),
- ('beresp.esi',
+ ('beresp.do_esi',
'BOOL',
( 'fetch',),
( 'fetch',),
'const struct sess *'
),
- ('beresp.gzip',
+ ('beresp.do_gzip',
'BOOL',
( 'fetch',),
( 'fetch',),
'const struct sess *'
),
- ('beresp.gunzip',
+ ('beresp.do_gunzip',
'BOOL',
( 'fetch',),
( 'fetch',),
Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c 2011-01-11 11:01:47 UTC (rev 5712)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c 2011-01-11 11:24:39 UTC (rev 5713)
@@ -283,16 +283,6 @@
/*--------------------------------------------------------------------*/
static void
-parse_esi(struct vcc *tl)
-{
-
- vcc_NextToken(tl);
- Fb(tl, 1, "VRT_ESI(sp);\n");
-}
-
-/*--------------------------------------------------------------------*/
-
-static void
parse_new_syntax(struct vcc *tl)
{
@@ -402,7 +392,6 @@
/* Keep list sorted from here */
{ "call", parse_call },
- { "esi", parse_esi, VCL_MET_FETCH },
{ "hash_data", parse_hash_data, VCL_MET_HASH },
{ "panic", parse_panic },
{ "ban", parse_ban },
More information about the varnish-commit
mailing list