[master] b47c027 4.0 updates

Per Buer perbu at varnish-software.com
Mon Feb 24 10:49:04 CET 2014

commit b47c02728e029d9bc8a9a03afe913fb6c297b132
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Feb 24 10:49:02 2014 +0100

    4.0 updates

diff --git a/doc/sphinx/users-guide/increasing-your-hitrate.rst b/doc/sphinx/users-guide/increasing-your-hitrate.rst
index fe1161d..9d1dc67 100644
--- a/doc/sphinx/users-guide/increasing-your-hitrate.rst
+++ b/doc/sphinx/users-guide/increasing-your-hitrate.rst
@@ -146,7 +146,8 @@ header. You could easily add support for this header in VCL.
 In vcl_fetch::
   if (beresp.http.Pragma ~ "nocache") {
-     return(hit_for_pass);
+        set beresp.uncacheable = true;
+	set beresp.ttl = 120s; // how long not to cache this url.
diff --git a/doc/sphinx/users-guide/vcl-actions.rst b/doc/sphinx/users-guide/vcl-actions.rst
index fc5a0da..691baa4 100644
--- a/doc/sphinx/users-guide/vcl-actions.rst
+++ b/doc/sphinx/users-guide/vcl-actions.rst
@@ -10,14 +10,6 @@ The most common actions to return are these:
  and from the backend server. It won't be cached. pass can be returned from
-  Similar to pass, but accessible from vcl_fetch. Unlike pass, hit_for_pass
-  will create a hitforpass object in the cache. This has the side-effect of
-  caching the decision not to cache. This is to allow would-be uncachable
-  requests to be passed to the backend at the same time. The same logic is
-  not necessary in vcl_recv because this happens before any potential
-  queueing for an object takes place.
   When you return lookup from vcl_recv you tell Varnish to deliver content 
   from cache even if the request othervise indicates that the request 
@@ -33,7 +25,7 @@ The most common actions to return are these:
   header before actually returning pipe. 
- Deliver the cached object to the client.  Usually returned from vcl_fetch. 
+ Deliver the object to the client.  Usually returned from vcl_backend_response. 
  Restart processing of the request. You can restart the processing of
diff --git a/doc/sphinx/users-guide/vcl-variables.rst b/doc/sphinx/users-guide/vcl-variables.rst
index f21e30e..20fcd4e 100644
--- a/doc/sphinx/users-guide/vcl-variables.rst
+++ b/doc/sphinx/users-guide/vcl-variables.rst
@@ -12,7 +12,7 @@ In VCL, there several important objects.
  The backend request object. Varnish contructs this before sending it to the 
- backend.
+ backend. It is based on the req object.
  The backend response object. It contains the headers of the object 

More information about the varnish-commit mailing list