Repository: trafficserver
Updated Branches:
  refs/heads/master 198639d12 -> 61e6dcd51


TS-2319] Change default behavior for the various ignore-mismatch configs


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

Branch: refs/heads/master
Commit: 61e6dcd515bd519d485fc31666eaf6c09559418a
Parents: 198639d
Author: Leif Hedstrom <[email protected]>
Authored: Tue Feb 25 15:57:55 2014 -0700
Committer: Leif Hedstrom <[email protected]>
Committed: Tue Feb 25 15:57:55 2014 -0700

----------------------------------------------------------------------
 CHANGES                                           |  7 +++++--
 doc/reference/configuration/records.config.en.rst | 18 +++++++++---------
 mgmt/RecordsConfig.cc                             |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61e6dcd5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 9f77abc..3fc0e38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,14 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2319] Change default behavior for the various ignore-mismatch
+   configurations.
+
   *) [TS-2563] Always set the SSL default verify paths.
    Author: Wei Sun <[email protected]>
 
-  *) [TS-2437] Add a lifecycle hook to expose loaded SSL certificates to 
plugins.
-   Author: Wei Sun <[email protected]>
+  *) [TS-2437] Add a lifecycle hook to expose loaded SSL certificates to
+   plugins. Author: Wei Sun <[email protected]>
 
   *) [TS-2582] Make traffic_cop debugging eadier by logging to stdout.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61e6dcd5/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 241e13e..846637b 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -1126,12 +1126,12 @@ Cache Control
 
    When enabled (``1``), Traffic Server looks up range requests in the cache.
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_mismatch INT 2
    :reloadable:
 
    When enabled with a value of ``1``, Traffic Server serves documents from 
cache with a
    ``Content-Type:`` header even if it does not match the ``Accept:`` header 
of the
-   request. If set to ``2``, this logic only happens in the absence of a
+   request. If set to ``2`` (default), this logic only happens in the absence 
of a
    ``Vary`` header in the cached response (which is the recommended and safe 
use).
 
    .. note::
@@ -1142,12 +1142,12 @@ Cache Control
       you can also enable this configuration with a ``1``.
 
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_language_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_language_mismatch INT 2
    :reloadable:
 
    When enabled with a value of ``1``, Traffic Server serves documents from 
cache with a
    ``Content-Language:`` header even if it does not match the 
``Accept-Language:``
-   header of the request. If set to ``2``, this logic only happens in the 
absence of a
+   header of the request. If set to ``2`` (default), this logic only happens 
in the absence of a
    ``Vary`` header in the cached response (which is the recommended and safe 
use).
 
    .. note::
@@ -1159,12 +1159,12 @@ Cache Control
       you can also enable this configuration with a ``1``.
 
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_encoding_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_encoding_mismatch INT 2
    :reloadable:
 
    When enabled with a value of ``1``, Traffic Server serves documents from 
cache with a
    ``Content-Encoding:`` header even if it does not match the 
``Accept-Encoding:``
-   header of the request. If set to ``2``, this logic only happens in the 
absence of a
+   header of the request. If set to ``2`` (default), this logic only happens 
in the absence of a
    ``Vary`` header in the cached response (which is the recommended and safe 
use).
 
    .. note::
@@ -1176,12 +1176,12 @@ Cache Control
       you can also enable this configuration with a ``1``.
 
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_charset_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_charset_mismatch INT 2
    :reloadable:
 
    When enabled with a value of ``1``, Traffic Server serves documents from 
cache with a
    ``Content-Type:`` header even if it does not match the ``Accept-Charset:`` 
header
-   of the request. If set to ``2``, this logic only happens in the absence of a
+   of the request. If set to ``2`` (default), this logic only happens in the 
absence of a
    ``Vary`` header in the cached response (which is the recommended and safe 
use).
 
    .. note::
@@ -1193,7 +1193,7 @@ Cache Control
       you can also enable this configuration with a ``1``.
 
 
-.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 1
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server ignores any ``Cache-Control:

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61e6dcd5/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 1b04a1f..10566b0 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -134,13 +134,13 @@ RecordElement RecordsConfig[] = {
   //# Support for disabling check for Accept-* / Content-* header mismatch
   //#
   
//##############################################################################
-  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_mismatch", RECD_INT, 
"0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_mismatch", RECD_INT, 
"2", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_language_mismatch", 
RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_language_mismatch", 
RECD_INT, "2", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_encoding_mismatch", 
RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_encoding_mismatch", 
RECD_INT, "2", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_charset_mismatch", 
RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.http.cache.ignore_accept_charset_mismatch", 
RECD_INT, "2", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL}
   ,
 
   
//##############################################################################

Reply via email to