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 2015/08/07 04:56:56 UTC
[3/6] trafficserver git commit: TS-3829 Remove remnants of proxy.pac
TS-3829 Remove remnants of proxy.pac
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1bf8746e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1bf8746e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1bf8746e
Branch: refs/heads/6.0.x
Commit: 1bf8746e0c60899a1f87fc6a47af2cceb55dd45a
Parents: 5597664
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Aug 6 16:52:33 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Aug 6 16:52:33 2015 -0600
----------------------------------------------------------------------
cmd/traffic_manager/AddConfigFilesHere.cc | 1 -
cmd/traffic_manager/traffic_manager.cc | 3 ---
doc/locale/ja/LC_MESSAGES/admin/explicit-proxy-caching.en.po | 8 --------
3 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bf8746e/cmd/traffic_manager/AddConfigFilesHere.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/AddConfigFilesHere.cc b/cmd/traffic_manager/AddConfigFilesHere.cc
index 56b7aca..34bc1da 100644
--- a/cmd/traffic_manager/AddConfigFilesHere.cc
+++ b/cmd/traffic_manager/AddConfigFilesHere.cc
@@ -70,7 +70,6 @@ initializeRegistry()
configFiles->addFile("logs_xml.config", false);
configFiles->addFile("storage.config", false);
configFiles->addFile("socks.config", false);
- configFiles->addFile("proxy.pac", 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/1bf8746e/cmd/traffic_manager/traffic_manager.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index d0ed870..cb6d00a 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -916,9 +916,6 @@ fileUpdated(char *fname, bool incVersion)
} else if (strcmp(fname, "storage.config") == 0) {
mgmt_log(stderr, "[fileUpdated] storage.config changed, need restart auto-rebuild mode\n");
- } else if (strcmp(fname, "proxy.pac") == 0) {
- mgmt_log(stderr, "[fileUpdated] proxy.pac 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/1bf8746e/doc/locale/ja/LC_MESSAGES/admin/explicit-proxy-caching.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/explicit-proxy-caching.en.po b/doc/locale/ja/LC_MESSAGES/admin/explicit-proxy-caching.en.po
index cda9a04..02c2fc9 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/explicit-proxy-caching.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/explicit-proxy-caching.en.po
@@ -96,14 +96,6 @@ msgid ""
"perform the following configuration:"
msgstr ""
-#: ../../admin/explicit-proxy-caching.en.rst:69
-msgid ""
-"Either copy an existing PAC file into the Traffic Server ``config`` "
-"directory or enter a script that defines the proxy server configuration "
-"settings in the ``proxy.pac`` file provided. The file is empty by default. "
-"A sample script is provided in `Sample PAC File`_."
-msgstr ""
-
#: ../../admin/explicit-proxy-caching.en.rst:74
msgid ""
"Specify the port Traffic Server uses to serve the its synthetic healthchecks. The default "