You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/12/10 16:04:04 UTC
[2/3] git commit: TS-2077 Remove
proxy.config.http.user_agent_pipeline remnants
TS-2077 Remove proxy.config.http.user_agent_pipeline remnants
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1247f0d6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1247f0d6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1247f0d6
Branch: refs/heads/master
Commit: 1247f0d659801d5c8611622955f5ec008fa6856d
Parents: adbccf9
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jul 26 10:32:18 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Dec 10 07:56:06 2013 -0700
----------------------------------------------------------------------
ci/jenkins/records.config | 1 -
lib/perl/lib/Apache/TS/AdminClient.pm | 1 -
mgmt/RecordsConfig.cc | 4 +---
proxy/config/records.config.default.in | 1 -
proxy/http/HttpConfig.cc | 2 --
proxy/http/HttpConfig.h | 2 --
6 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/ci/jenkins/records.config
----------------------------------------------------------------------
diff --git a/ci/jenkins/records.config b/ci/jenkins/records.config
index ba99c95..11057d6 100644
--- a/ci/jenkins/records.config
+++ b/ci/jenkins/records.config
@@ -140,7 +140,6 @@ CONFIG proxy.config.http.send_http11_requests INT 1
# 2 - Share, with a connection pool per worker thread
CONFIG proxy.config.http.share_server_sessions INT 2
CONFIG proxy.config.http.origin_server_pipeline INT 1
-CONFIG proxy.config.http.user_agent_pipeline INT 8
##########################
# HTTP referer filtering #
##########################
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/lib/perl/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index f6fa827..6f6ea73 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -521,7 +521,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.http.transaction_no_activity_timeout_out
proxy.config.http_ui_enabled
proxy.config.http.uncacheable_requests_bypass_parent
- proxy.config.http.user_agent_pipeline
proxy.config.icp.default_reply_port
proxy.config.icp.enabled
proxy.config.icp.icp_configuration
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index bf3674e..1b45bfb 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -426,7 +426,7 @@ RecordElement RecordsConfig[] = {
// #
{RECT_CONFIG, "proxy.config.http.send_http11_requests", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- // # origin_server_pipeline and user_agent_pipeline
+ // # origin_server_pipeline
// #
// # 0 - no keepalive
// # n >= 1 - max pipeline window
@@ -434,8 +434,6 @@ RecordElement RecordsConfig[] = {
// #
{RECT_CONFIG, "proxy.config.http.origin_server_pipeline", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.user_agent_pipeline", RECD_INT, "8", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.http.share_server_sessions", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.record_heartbeat", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/proxy/config/records.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index 870637d..bc3c9ce 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -146,7 +146,6 @@ CONFIG proxy.config.http.send_http11_requests INT 1
# 2 - Share, with a connection pool per worker thread
CONFIG proxy.config.http.share_server_sessions INT 2
CONFIG proxy.config.http.origin_server_pipeline INT 1
-CONFIG proxy.config.http.user_agent_pipeline INT 8
##########################
# HTTP referer filtering #
##########################
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index d36b3cc..0ec4d61 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1179,7 +1179,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.oride.flow_high_water_mark, "proxy.config.http.flow_control.high_water");
HttpEstablishStaticConfigLongLong(c.oride.flow_low_water_mark, "proxy.config.http.flow_control.low_water");
HttpEstablishStaticConfigLongLong(c.origin_server_pipeline, "proxy.config.http.origin_server_pipeline");
- HttpEstablishStaticConfigLongLong(c.user_agent_pipeline, "proxy.config.http.user_agent_pipeline");
HttpEstablishStaticConfigByte(c.oride.share_server_sessions, "proxy.config.http.share_server_sessions");
HttpEstablishStaticConfigByte(c.oride.keep_alive_post_out, "proxy.config.http.keep_alive_post_out");
@@ -1433,7 +1432,6 @@ HttpConfig::reconfigure()
}
params->origin_server_pipeline = m_master.origin_server_pipeline;
- params->user_agent_pipeline = m_master.user_agent_pipeline;
params->oride.share_server_sessions = m_master.oride.share_server_sessions;
params->oride.keep_alive_post_out = INT_TO_BOOL(m_master.oride.keep_alive_post_out);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1247f0d6/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index a663e2f..91470fd 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -669,7 +669,6 @@ public:
///////////////////////////////////////////////////
MgmtByte session_auth_cache_keep_alive_enabled;
MgmtInt origin_server_pipeline;
- MgmtInt user_agent_pipeline;
MgmtInt transaction_active_timeout_in;
MgmtInt accept_no_activity_timeout;
@@ -894,7 +893,6 @@ HttpConfigParams::HttpConfigParams()
num_url_expansions(0),
session_auth_cache_keep_alive_enabled(1),
origin_server_pipeline(1),
- user_agent_pipeline(8),
transaction_active_timeout_in(900),
accept_no_activity_timeout(120),
parent_connect_attempts(4),