This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit cd26a4ffc253f949d952d99231344edf311555ca
Author: Steve Malenfant <steve.malenf...@cox.com>
AuthorDate: Fri Feb 2 08:10:12 2018 -0500
Change based on reviews
- fix typo in ApacheTrafficServer.pm related to __http__r
- Added ConfigFiles.pm for backward compatilibity
---
traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 2 +-
traffic_ops/app/lib/UI/ConfigFiles.pm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index bddd705..21a83ba 100755
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -917,7 +917,7 @@ sub ds_data {
$re =~ s/\.\*//g;
my $hname = $ds_type =~ /^DNS/ ?
$dsinfo->routing_name : "__http__";
my $portstr = "";
- if ( $hname eq "__http__r" &&
$server_obj->tcp_port > 0 && $server_obj->tcp_port != 80 ) {
+ if ( $hname eq "__http__" &&
$server_obj->tcp_port > 0 && $server_obj->tcp_port != 80 ) {
$portstr = ":" . $server_obj->tcp_port;
}
my $map_from = "http://"; . $hname . $re .
$ds_domain . $portstr . "/";
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm
b/traffic_ops/app/lib/UI/ConfigFiles.pm
index 39805a3..27cc7e7 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -221,9 +221,9 @@ sub ds_data {
my $re = $host_re;
$re =~ s/\\//g;
$re =~ s/\.\*//g;
- my $hname = $ds_type =~ /^DNS/ ?
$row->routing_name : "ccr";
+ my $hname = $ds_type =~ /^DNS/ ?
$row->routing_name : "__http__";
my $portstr = "";
- if ( $hname eq "ccr" && $server->tcp_port > 0
&& $server->tcp_port != 80 ) {
+ if ( $hname eq "__http__" && $server->tcp_port
> 0 && $server->tcp_port != 80 ) {
$portstr = ":" . $server->tcp_port;
}
my $map_from = "http://"; . $hname . $re .
$ds_domain . $portstr . "/";
@@ -1093,7 +1093,7 @@ sub build_remap_line {
my $host_name = $data->{host_name};
my $dscp = $remap->{dscp};
- $map_from =~ s/ccr/$host_name/;
+ $map_from =~ s/__http__/$host_name/;
if ( defined( $pdata->{'dscp_remap'} ) ) {
$text .= "map " . $map_from . " " . $map_to . "
\@plugin=dscp_remap.so \@pparam=" . $dscp;
--
To stop receiving notification emails like this one, please contact
mitchell...@apache.org.
