Synchronize these two files.

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

diff --git a/varnish-cache/etc/default.vcl b/varnish-cache/etc/default.vcl
index 6b5ddbfa543573718babfdeee41f3c3020f89bd2..a8886549edad3ca1ea6b7777c284a39337e7f780 100644 (file)
--- a/varnish-cache/etc/default.vcl
+++ b/varnish-cache/etc/default.vcl
@@ -75,14 +75,27 @@ backend default {
 #      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;
+#}

diff --git a/varnish-cache/man/vcl.7 b/varnish-cache/man/vcl.7
index 17deb22743fb649ba9e4b38e8c9bb886a7106c34..4ce39153b6e4905f436248288f3667a7f636a375 100644 (file)
--- a/varnish-cache/man/vcl.7
+++ b/varnish-cache/man/vcl.7
@@ -28,7 +28,7 @@
 .\"
 .\" $Id$
 .\"
-.Dd July 13, 2007
+.Dd August 3, 2007
 .Dt VCL 7
 .Os
 .Sh NAME
@@ -474,7 +474,7 @@ sub vcl_fetch {
 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 @@ sub vcl_deliver {
     deliver;
 }
 
-sub vcl_discard {
+sub vcl_timeout {
     discard;
 }
 
-sub vcl_timeout {
+sub vcl_discard {
     discard;
 }
 .Ed