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/02/21 00:49:39 UTC
trafficserver git commit: TS-3334 Restore default for
proxy.config.proxy_name
Repository: trafficserver
Updated Branches:
refs/heads/master f33e30789 -> 03139f8d3
TS-3334 Restore default for proxy.config.proxy_name
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/03139f8d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/03139f8d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/03139f8d
Branch: refs/heads/master
Commit: 03139f8d363f61101cdae081cd17fd11821c36f5
Parents: f33e307
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Feb 20 16:49:17 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Feb 20 16:49:17 2015 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
mgmt/RecordsConfig.cc | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03139f8d/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5b74400..d747a90 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3334] Restore default for proxy.config.proxy_name.
+
*) [TS-3345] cacheurl plugin: Better error handling on config problems.
*) [TS-3397] Bug with ink_strlcpy and non-null terminated strings.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03139f8d/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 575c374..b4da3e6 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -48,7 +48,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.product_name", RECD_STRING, "Traffic Server", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.proxy_name", RECD_STRING, "<proxy_name>", RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".+", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.proxy_name", RECD_STRING, BUILD_MACHINE, RECU_DYNAMIC, RR_REQUIRED, RECC_STR, ".+", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.bin_path", RECD_STRING, "bin", RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_READ_ONLY}
,