[trafficserver] branch master updated: cleanup ICP code removal

[so...@apache.org]

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

sorber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  8a0e2bb   cleanup ICP code removal
8a0e2bb is described below

commit 8a0e2bbf09f48880ab74734f755ddd8e51cb683d
Author: Vijay Mamidi <vi...@yahoo.com>
AuthorDate: Wed May 10 15:58:03 2017 -0400

    cleanup ICP code removal
---
 cmd/traffic_manager/traffic_manager.cc | 3 ---
 iocore/net/P_Connection.h              | 1 -
 proxy/http/HttpConfig.cc               | 5 -----
 proxy/http/HttpConfig.h                | 5 -----
 4 files changed, 14 deletions(-)

diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index fa1c5ae..3f5734c 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -920,9 +920,6 @@ fileUpdated(char *fname, bool incVersion)
   } else if (strcmp(fname, "storage.config") == 0) {
     mgmt_log("[fileUpdated] storage.config changed, need restart auto-rebuild mode\n");
 
-  } else if (strcmp(fname, "icp.config") == 0) {
-    lmgmt->signalFileChange("proxy.config.icp.icp_configuration");
-
   } else if (strcmp(fname, "volume.config") == 0) {
     mgmt_log("[fileUpdated] volume.config changed, need restart\n");
 
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index a9eb3a5..662929a 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -114,7 +114,6 @@ struct Connection {
               );
 
   /// Set the internal socket address struct.
-  /// @internal Used only by ICP.
   void
   setRemote(sockaddr const *remote_addr ///< Address and port.
             )
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 5bd2bab..ed546e3 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1003,9 +1003,6 @@ HttpConfig::startup()
   HttpEstablishStaticConfigByte(c.enable_http_stats, "proxy.config.http.enable_http_stats");
   HttpEstablishStaticConfigByte(c.oride.normalize_ae_gzip, "proxy.config.http.normalize_ae_gzip");
 
-  HttpEstablishStaticConfigByte(c.icp_enabled, "proxy.config.icp.enabled");
-  HttpEstablishStaticConfigByte(c.stale_icp_enabled, "proxy.config.icp.stale_icp_enabled");
-
   HttpEstablishStaticConfigLongLong(c.oride.cache_heuristic_min_lifetime, "proxy.config.http.cache.heuristic_min_lifetime");
   HttpEstablishStaticConfigLongLong(c.oride.cache_heuristic_max_lifetime, "proxy.config.http.cache.heuristic_max_lifetime");
   HttpEstablishStaticConfigFloat(c.oride.cache_heuristic_lm_factor, "proxy.config.http.cache.heuristic_lm_factor");
@@ -1513,5 +1510,3 @@ HttpConfig::parse_ports_list(char *ports_string)
   }
   return (ports_list);
 }
-
-volatile int32_t icp_dynamic_enabled;
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 504ca33..fef66c2 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -115,8 +115,6 @@ enum {
   http_tunnels_stat,
   http_throttled_proxy_only_stat,
 
-  http_icp_suggested_lookups_stat,
-
   // document size stats
   http_user_agent_request_header_total_size_stat,
   http_user_agent_response_header_total_size_stat,
@@ -787,9 +785,6 @@ public:
 
   MgmtByte enable_http_stats; // Can be "slow"
 
-  MgmtByte icp_enabled;
-  MgmtByte stale_icp_enabled;
-
   MgmtByte cache_post_method;
 
   MgmtByte push_method_enabled;

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].