You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/08/28 17:01:45 UTC

trafficserver git commit: [TS-3872] Minor doc fixup.

Repository: trafficserver
Updated Branches:
  refs/heads/master d028eda23 -> 4f2967e9f


[TS-3872] Minor doc fixup.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4f2967e9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4f2967e9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4f2967e9

Branch: refs/heads/master
Commit: 4f2967e9fef7a44f2db7c9a551a3ce39fc9ae4b6
Parents: d028eda
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Fri Aug 28 15:00:31 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Fri Aug 28 15:00:31 2015 +0000

----------------------------------------------------------------------
 doc/reference/configuration/records.config.en.rst | 5 +++--
 mgmt/RecordsConfig.cc                             | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4f2967e9/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index f124a79..70ec156 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -1711,8 +1711,9 @@ all the different user-agent versions of documents it encounters.
    -  ``0`` = default, disable cache and goto origin server
    -  ``1`` = return a 502 error on a cache miss
    -  ``2`` = serve stale if object's age is under :ts:cv:`proxy.config.http.cache.max_stale_age`, else, goto origin server
-   -  ``3`` = return a 502 error on a cache miss or serve stale if object's age is under :ts:cv:`proxy.config.http.cache.max_stale_age`, else, goto origin server
-   -  ``4`` = return a 502 error on either a cache miss or a cache stale
+   -  ``3`` = return a 502 error on a cache miss or serve stale on a cache revalidate
+              if object's age is under :ts:cv:`proxy.config.http.cache.max_stale_age`, else, goto origin server
+   -  ``4`` = return a 502 error on either a cache miss or on a revalidate
 
 Customizable User Response Pages
 ================================

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4f2967e9/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 4523700..aa3c886 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -652,9 +652,9 @@ static const RecordElement RecordsConfig[] =
   //       #
   //       #  0 - default. disable cache and goto origin
   //       #  1 - return error if cache miss
-  //       #  2 - serve stale until proxy.config.http.cache.max_stale_age, then goto origin, if refresh_miss
-  //       #  3 - return error if cache miss or serve stale until proxy.config.http.cache.max_stale_age, then goto origin, if refresh_miss
-  //       #  4 - return error if cache miss or cache stale
+  //       #  2 - serve stale until proxy.config.http.cache.max_stale_age, then goto origin, if revalidate
+  //       #  3 - return error if cache miss or serve stale until proxy.config.http.cache.max_stale_age, then goto origin, if revalidate
+  //       #  4 - return error if cache miss or if revalidate
   {RECT_CONFIG, "proxy.config.http.cache.open_write_fail_action", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
   ,
   //       #  when_to_revalidate has 4 options: