Author: zwoop
Date: Thu Nov 3 15:05:09 2011
New Revision: 1197173
URL: http://svn.apache.org/viewvc?rev=1197173&view=rev
Log:
Eliminate proxy.config.http.append_xforwards_header, which is never used
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
trafficserver/traffic/trunk/proxy/config/records.config.default.in
trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http/HttpConfig.h
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Thu Nov 3 15:05:09 2011
@@ -1,5 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.1
+ *) [TS-1012] Eliminate proxy.config.http.append_xforwards_header, which
+ is never used.
+
*) [TS-1004] Transformation plugins cause connection close when content
length is not known ahead. Author: Otto van der Schaaf.
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
---
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
(original)
+++
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
Thu Nov 3 15:05:09 2011
@@ -405,7 +405,6 @@ The Apache Traffic Server Administration
proxy.config.http.anonymize_remove_from
proxy.config.http.anonymize_remove_referer
proxy.config.http.anonymize_remove_user_agent
- proxy.config.http.append_xforwards_header
proxy.config.http.avoid_content_spoofing
proxy.config.http.background_fill_active_timeout
proxy.config.http.background_fill_completed_threshold
Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Thu Nov 3 15:05:09 2011
@@ -632,8 +632,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.http.anonymize_insert_client_ip", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.append_xforwards_header", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.http.anonymize_other_header_list", RECD_STRING,
NULL, RECU_DYNAMIC, RR_NULL, RECC_STR, ".*", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.insert_squid_x_forwarded_for", RECD_INT,
"1", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Thu Nov 3 15:05:09 2011
@@ -7308,9 +7308,6 @@ _conf_to_memberp(TSOverridableConfigKey
case TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP:
ret = &sm->t_state.txn_conf->anonymize_insert_client_ip;
break;
- case TS_CONFIG_HTTP_APPEND_XFORWARDS_HEADER:
- ret = &sm->t_state.txn_conf->append_xforwards_header;
- break;
case TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED:
ret = &sm->t_state.txn_conf->proxy_response_server_enabled;
break;
@@ -7710,9 +7707,7 @@ TSHttpTxnConfigFind(const char* name, in
cnf = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE;
break;
case 'r':
- if (!strncmp(name, "proxy.config.http.append_xforwards_header", length))
- cnf = TS_CONFIG_HTTP_APPEND_XFORWARDS_HEADER;
- else if (!strncmp(name, "proxy.config.http.insert_response_via_str",
length))
+ if (!strncmp(name, "proxy.config.http.insert_response_via_str", length))
cnf = TS_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR;
break;
}
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Thu Nov 3 15:05:09 2011
@@ -7550,7 +7550,6 @@ const char *SDK_Overridable_Configs[] =
"proxy.config.http.anonymize_remove_cookie",
"proxy.config.http.anonymize_remove_client_ip",
"proxy.config.http.anonymize_insert_client_ip",
- "proxy.config.http.append_xforwards_header",
"proxy.config.http.response_server_enabled",
"proxy.config.http.insert_squid_x_forwarded_for",
"proxy.config.http.server_tcp_init_cwnd",
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h.in?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Thu Nov 3 15:05:09 2011
@@ -505,7 +505,6 @@ extern "C"
TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE,
TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP,
TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP,
- TS_CONFIG_HTTP_APPEND_XFORWARDS_HEADER,
TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED,
TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR,
TS_CONFIG_HTTP_SERVER_TCP_INIT_CWND,
Modified: trafficserver/traffic/trunk/proxy/config/records.config.default.in
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.default.in?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.default.in
(original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.default.in Thu Nov
3 15:05:09 2011
@@ -180,7 +180,6 @@ CONFIG proxy.config.http.anonymize_remov
CONFIG proxy.config.http.anonymize_remove_client_ip INT 0
CONFIG proxy.config.http.anonymize_insert_client_ip INT 1
CONFIG proxy.config.http.anonymize_other_header_list STRING NULL
-CONFIG proxy.config.http.append_xforwards_header INT 0
CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 1
############
# security #
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.cc?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.cc Thu Nov 3 15:05:09
2011
@@ -1228,7 +1228,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigByte(c.oride.anonymize_remove_cookie,
"proxy.config.http.anonymize_remove_cookie");
HttpEstablishStaticConfigByte(c.oride.anonymize_remove_client_ip,
"proxy.config.http.anonymize_remove_client_ip");
HttpEstablishStaticConfigByte(c.oride.anonymize_insert_client_ip,
"proxy.config.http.anonymize_insert_client_ip");
- HttpEstablishStaticConfigByte(c.oride.append_xforwards_header,
"proxy.config.http.append_xforwards_header");
HttpEstablishStaticConfigStringAlloc(c.anonymize_other_header_list,
"proxy.config.http.anonymize_other_header_list");
HttpEstablishStaticConfigStringAlloc(c.global_user_agent_header,
"proxy.config.http.global_user_agent_header");
c.global_user_agent_header_size = c.global_user_agent_header ?
strlen(c.global_user_agent_header) : 0;
@@ -1496,7 +1495,6 @@ HttpConfig::reconfigure()
params->oride.anonymize_remove_cookie =
INT_TO_BOOL(m_master.oride.anonymize_remove_cookie);
params->oride.anonymize_remove_client_ip =
INT_TO_BOOL(m_master.oride.anonymize_remove_client_ip);
params->oride.anonymize_insert_client_ip =
INT_TO_BOOL(m_master.oride.anonymize_insert_client_ip);
- params->oride.append_xforwards_header =
INT_TO_BOOL(m_master.oride.append_xforwards_header);
params->anonymize_other_header_list =
ats_strdup(m_master.anonymize_other_header_list);
params->global_user_agent_header =
ats_strdup(m_master.global_user_agent_header);
Modified: trafficserver/traffic/trunk/proxy/http/HttpConfig.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpConfig.h?rev=1197173&r1=1197172&r2=1197173&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpConfig.h Thu Nov 3 15:05:09 2011
@@ -407,7 +407,7 @@ struct OverridableHttpConfigParams {
fwd_proxy_auth_to_parent(0),
anonymize_remove_from(0), anonymize_remove_referer(0),
anonymize_remove_user_agent(0),
anonymize_remove_cookie(0), anonymize_remove_client_ip(0),
anonymize_insert_client_ip(1),
- append_xforwards_header(0), proxy_response_server_enabled(0),
+ proxy_response_server_enabled(0),
insert_squid_x_forwarded_for(0), send_http11_requests(3), //
SEND_HTTP11_IF_REQUEST_11_AND_HOSTDB
cache_http(0), cache_ignore_client_no_cache(0),
cache_ignore_client_cc_max_age(1),
cache_ims_on_client_no_cache(0), cache_ignore_server_no_cache(0),
cache_responses_to_cookies(0),
@@ -475,7 +475,6 @@ struct OverridableHttpConfigParams {
MgmtByte anonymize_remove_cookie;
MgmtByte anonymize_remove_client_ip;
MgmtByte anonymize_insert_client_ip;
- MgmtByte append_xforwards_header;
MgmtByte proxy_response_server_enabled;
