Mailing List Archive

Author: des
Date: 2007-08-03 20:46:43 +0200 (Fri, 03 Aug 2007)
New Revision: 1793

Modified:
trunk/varnish-cache/etc/default.vcl
trunk/varnish-cache/man/vcl.7
Log:
Synchronize these two files.


Modified: trunk/varnish-cache/etc/default.vcl
===================================================================
--- trunk/varnish-cache/etc/default.vcl 2007-07-31 06:06:28 UTC (rev 1792)
+++ trunk/varnish-cache/etc/default.vcl 2007-08-03 18:46:43 UTC (rev 1793)
@@ -75,14 +75,27 @@
# if (!obj.cacheable) {
# pass;
# }
-# if (resp.http.Set-Cookie) {
+# if (obj.http.Set-Cookie) {
# pass;
# }
# insert;
#}
#
+#
+## Called before a cached object is delivered to the client
+#
+#sub vcl_deliver {
+# deliver;
+#}
+#
## Called when an object nears its expiry time
#
#sub vcl_timeout {
# discard;
#}
+#
+## Called when an object is about to be discarded
+#
+#sub vcl_discard {
+# discard;
+#}

Modified: trunk/varnish-cache/man/vcl.7
===================================================================
--- trunk/varnish-cache/man/vcl.7 2007-07-31 06:06:28 UTC (rev 1792)
+++ trunk/varnish-cache/man/vcl.7 2007-08-03 18:46:43 UTC (rev 1793)
@@ -28,7 +28,7 @@
.\"
.\" $Id$
.\"
-.Dd July 13, 2007
+.Dd August 3, 2007
.Dt VCL 7
.Os
.Sh NAME
@@ -474,7 +474,7 @@
The following code is the equivalent of the default configuration with
the backend address set to "backend.example.com" and no backend port
specified.
-.\" Keep this in synch with bin/varnishd/mgt_vcc.c
+.\" Keep this in synch with bin/varnishd/mgt_vcc.c and etc/default.vcl
.Bd -literal -offset 4n
backend default {
set backend.host = "backend.example.com";
@@ -534,11 +534,11 @@
deliver;
}

-sub vcl_discard {
+sub vcl_timeout {
discard;
}

-sub vcl_timeout {
+sub vcl_discard {
discard;
}
.Ed