[trafficserver] 01/02: Remove obsolete 4-2-0-fixup

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 0879dd8090dd86d26e33549fa5a3db6dbc2b3264
Author: Susan Hinrichs <sh...@oath.com>
AuthorDate: Wed Oct 16 19:16:49 2019 +0000

    Remove obsolete 4-2-0-fixup
    
    (cherry picked from commit c7a4ffafd8eeb0e4b80ed057963722c33029acc8)
---
 iocore/cache/Cache.cc     | 5 -----
 iocore/cache/CacheRead.cc | 2 --
 mgmt/RecordsConfig.cc     | 7 -------
 3 files changed, 14 deletions(-)

diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 5fbd2fc..ccb4471 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -82,9 +82,6 @@ int cache_config_read_while_writer             = 0;
 int cache_config_mutex_retry_delay             = 2;
 int cache_read_while_writer_retry_delay        = 50;
 int cache_config_read_while_writer_max_retries = 10;
-/// Fix up a specific known problem with the 4.2.0 release.
-/// Not used for stripes with a cache version later than 4.2.0.
-int cache_config_compatibility_4_2_0_fixup = 1;
 
 // Globals
 
@@ -3116,8 +3113,6 @@ ink_cache_init(ts::ModuleVersion v)
     cache_config_target_fragment_size = DEFAULT_TARGET_FRAGMENT_SIZE;
   }
 
-  REC_EstablishStaticConfigInt32(cache_config_compatibility_4_2_0_fixup, "proxy.config.cache.http.compatibility.4-2-0-fixup");
-
   REC_EstablishStaticConfigInt32(cache_config_max_disk_errors, "proxy.config.cache.max_disk_errors");
   Debug("cache_init", "proxy.config.cache.max_disk_errors = %d", cache_config_max_disk_errors);
 
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index ee8f31c..8a73132 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -25,8 +25,6 @@
 
 #include "HttpCacheSM.h" //Added to get the scope of HttpCacheSM object.
 
-extern int cache_config_compatibility_4_2_0_fixup;
-
 Action *
 Cache::open_read(Continuation *cont, const CacheKey *key, CacheFragType type, const char *hostname, int host_len)
 {
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 5c1c42e..58003e2 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1459,13 +1459,6 @@ static const RecordElement RecordsConfig[] =
   {RECT_CONFIG, "proxy.config.remap.num_remap_threads", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
   ,
 
-  //###########
-  //#
-  //# Temporary and esoteric values.
-  //#
-  //###########
-  {RECT_CONFIG, "proxy.config.cache.http.compatibility.4-2-0-fixup", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL},
-
   // Controls for TLS ASYN_JOBS and engine loading
   {RECT_CONFIG, "proxy.config.ssl.async.handshake.enabled", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL},
   {RECT_CONFIG, "proxy.config.ssl.engine.conf_file", RECD_STRING, nullptr, RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL},