r1820 - in branches/1.1: . man

[des at projects.linpro.no]

Author: des
Date: 2007-08-09 16:59:37 +0200 (Thu, 09 Aug 2007)
New Revision: 1820

Modified:
   branches/1.1/
   branches/1.1/man/vcl.7
Log:
Merged revisions 1819 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1819 | des | 2007-08-09 16:58:56 +0200 (Thu, 09 Aug 2007) | 2 lines
  
  Explain the meaning of obj.valid and obj.cacheable.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1793,1795,1797-1798,1800-1808,1810-1815,1817
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1793,1795,1797-1798,1800-1808,1810-1815,1817,1819

Modified: branches/1.1/man/vcl.7
===================================================================
--- branches/1.1/man/vcl.7	2007-08-09 14:58:56 UTC (rev 1819)
+++ branches/1.1/man/vcl.7	2007-08-09 14:59:37 UTC (rev 1820)
@@ -424,10 +424,17 @@
 .It Va obj.response
 The HTTP status message returned by the server.
 .It Va obj.valid
-True if the object was successfully retrieved.
+True if the request resulted in a valid HTTP response.
 .It Va obj.cacheable
-True if the object is cacheable.
-.\" XXX what are the criteria?
+True if the request resulted in a cacheable response.
+.\" see cache_center.c and rfc2616.c for details
+A response is considered cacheable if it is valid (see above), the
+HTTP status code is 200, 203, 300, 301, 302, 404 or 410 and it has a
+non-zero time-to-live when
+.Cm Expires
+and
+.Cm Cache-Control
+headers are taken into account.
 .It Va obj.ttl
 The object's remaining time to live, in seconds.
 .It Va obj.lastuse