Repository: trafficserver Updated Branches: refs/heads/6.0.x 1c2ea99cf -> fdceeb5f6
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/fdceeb5f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fdceeb5f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fdceeb5f Branch: refs/heads/6.0.x Commit: fdceeb5f6cee93dad7579fb56e37ee952fa0ad23 Parents: 1c2ea99 Author: Leif Hedstrom <[email protected]> Authored: Thu Aug 6 16:52:33 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Aug 6 16:53:19 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/fdceeb5f/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/fdceeb5f/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/fdceeb5f/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 "
