Repository: trafficserver
Updated Branches:
refs/heads/5.2.x a424333cd -> 1d4f7ecbe
TS-3334 Restore default for proxy.config.proxy_name
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1d4f7ecb
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1d4f7ecb
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1d4f7ecb
Branch: refs/heads/5.2.x
Commit: 1d4f7ecbeaf15a7b087333489a53363b110995a0
Parents: a424333
Author: Leif Hedstrom <[email protected]>
Authored: Fri Feb 20 16:49:17 2015 -0700
Committer: Leif Hedstrom <[email protected]>
Committed: Fri Feb 20 16:50:46 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/1d4f7ecb/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c194b54..f39d9bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.2.1
+ *) [TS-3334] Restore default for proxy.config.proxy_name.
+
*) [TS-3397] Bug with ink_strlcpy and non-null terminated strings.
*) [TS-3359] Use after free: Tunnel destroyed without updating HttpSM.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d4f7ecb/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 3fbbfdd..1158e3a 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}
,
