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/04/15 22:46:32 UTC
[25/50] git commit: TS-1783 Remove the remnants of wpad.dat
TS-1783 Remove the remnants of wpad.dat
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cf1550df
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cf1550df
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cf1550df
Branch: refs/heads/3.3.x
Commit: cf1550dfd64834ad1ebeb425008d40eb95601a2a
Parents: 7f4bd7b
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Mar 27 12:29:58 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Apr 15 14:45:43 2013 -0600
----------------------------------------------------------------------
.../perl/AdminClient/lib/Apache/TS/AdminClient.pm | 1 -
mgmt/AddConfigFilesHere.cc | 1 -
mgmt/Main.cc | 3 ---
mgmt/RecordsConfig.cc | 2 --
mgmt/web2/WebHttp.cc | 1 -
5 files changed, 0 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cf1550df/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm b/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
index 1374cf4..82968db 100644
--- a/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
+++ b/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
@@ -270,7 +270,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.admin.autoconf.pac_filename
proxy.config.admin.autoconf_port
proxy.config.admin.autoconf.doc_root
- proxy.config.admin.autoconf.wpad_filename
proxy.config.admin.cli_path
proxy.config.admin.number_config_bak
proxy.config.admin.user_id
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cf1550df/mgmt/AddConfigFilesHere.cc
----------------------------------------------------------------------
diff --git a/mgmt/AddConfigFilesHere.cc b/mgmt/AddConfigFilesHere.cc
index 95db5c9..a1e60ae 100644
--- a/mgmt/AddConfigFilesHere.cc
+++ b/mgmt/AddConfigFilesHere.cc
@@ -71,7 +71,6 @@ initializeRegistry()
configFiles->addFile("storage.config", false);
configFiles->addFile("socks.config", false);
configFiles->addFile("proxy.pac", false);
- configFiles->addFile("wpad.dat", false);
configFiles->addFile("records.config", false);
configFiles->addFile("vaddrs.config", false);
configFiles->addFile("cache.config", false);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cf1550df/mgmt/Main.cc
----------------------------------------------------------------------
diff --git a/mgmt/Main.cc b/mgmt/Main.cc
index 3760366..06f3e6a 100644
--- a/mgmt/Main.cc
+++ b/mgmt/Main.cc
@@ -1056,9 +1056,6 @@ fileUpdated(char *fname)
} else if (strcmp(fname, "proxy.pac") == 0) {
mgmt_log(stderr, "[fileUpdated] proxy.pac file has been modified\n");
- } else if (strcmp(fname, "wpad.dat") == 0) {
- mgmt_log(stderr, "[fileUpdated] wpad.dat file has been modified\n");
-
} else if (strcmp(fname, "icp.config") == 0) {
lmgmt->signalFileChange("proxy.config.icp.icp_configuration");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cf1550df/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index bf9e56a..75464bf 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -259,8 +259,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.admin.autoconf.pac_filename", RECD_STRING, "proxy.pac", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.admin.autoconf.wpad_filename", RECD_STRING, "wpad.dat", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.admin.admin_user", RECD_STRING, "admin", RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".+", RECA_NO_ACCESS}
,
{RECT_CONFIG, "proxy.config.admin.number_config_bak", RECD_INT, "3", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cf1550df/mgmt/web2/WebHttp.cc
----------------------------------------------------------------------
diff --git a/mgmt/web2/WebHttp.cc b/mgmt/web2/WebHttp.cc
index 5b331ab..14c0804 100644
--- a/mgmt/web2/WebHttp.cc
+++ b/mgmt/web2/WebHttp.cc
@@ -480,7 +480,6 @@ WebHttpInit()
// initialize allow files
g_autoconf_allow_ht = ink_hash_table_create(InkHashTableKeyType_String);
ink_hash_table_insert(g_autoconf_allow_ht, "/proxy.pac", NULL);
- ink_hash_table_insert(g_autoconf_allow_ht, "/wpad.dat", NULL);
ink_hash_table_insert(g_autoconf_allow_ht, "/public_key.der", NULL);
ink_hash_table_insert(g_autoconf_allow_ht, "/synthetic.txt", NULL);