Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 0172d2764 -> 469a6dde6
restores constants Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/676edf81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/676edf81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/676edf81 Branch: refs/heads/master Commit: 676edf81d5c0d3ec22c7c49cc64bb279ad2573ee Parents: bd4cc2c Author: Derek Gelinas <derek_geli...@cable.comcast.com> Authored: Tue Mar 14 14:56:31 2017 -0400 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Tue Mar 14 13:02:39 2017 -0600 ---------------------------------------------------------------------- .../app/lib/API/Configs/ApacheTrafficServer.pm | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/676edf81/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm index e7a8a89..cd3271b 100644 --- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm +++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm @@ -490,14 +490,14 @@ sub cdn_ds_data { my $hname = $ds_type =~ /^DNS/ ? "edge" : "ccr"; my $portstr = ":" . "SERVER_TCP_PORT"; my $map_from = "http://"; . $hname . $re . $ds_domain . $portstr . "/"; - if ( $protocol == 0 ) { + if ( $protocol == HTTP ) { $dsinfo->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 1 || $protocol == 3 ) { + elsif ( $protocol == HTTPS || $protocol == HTTP_TO_HTTPS ) { $map_from = "https://"; . $hname . $re . $ds_domain . "/"; $dsinfo->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 2 ) { + elsif ( $protocol == HTTP_AND_HTTPS ) { #add the first one with http $dsinfo->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; @@ -509,14 +509,14 @@ sub cdn_ds_data { } else { my $map_from = "http://"; . $host_re . "/"; - if ( $protocol == 0 ) { + if ( $protocol == HTTP ) { $dsinfo->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 1 || $protocol == 3 ) { + elsif ( $protocol == HTTPS || $protocol == HTTP_TO_HTTPS ) { $map_from = "https://"; . $host_re . "/"; $dsinfo->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 2 ) { + elsif ( $protocol == HTTP_AND_HTTPS ) { #add the first with http $dsinfo->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; @@ -625,14 +625,14 @@ sub ds_data { $portstr = ":" . $server_obj->tcp_port; } my $map_from = "http://"; . $hname . $re . $ds_domain . $portstr . "/"; - if ( $protocol == 0 ) { + if ( $protocol == HTTP ) { $response_obj->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 1 || $protocol == 3 ) { + elsif ( $protocol == HTTPS || $protocol == HTTP_TO_HTTPS ) { $map_from = "https://"; . $hname . $re . $ds_domain . "/"; $response_obj->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 2 ) { + elsif ( $protocol == HTTP_AND_HTTPS ) { #add the first one with http $response_obj->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; @@ -644,14 +644,14 @@ sub ds_data { } else { my $map_from = "http://"; . $host_re . "/"; - if ( $protocol == 0 ) { + if ( $protocol == HTTP ) { $response_obj->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 1 || $protocol == 3 ) { + elsif ( $protocol == HTTPS || $protocol == HTTP_TO_HTTPS ) { $map_from = "https://"; . $host_re . "/"; $response_obj->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to; } - elsif ( $protocol == 2 ) { + elsif ( $protocol == HTTP_AND_HTTPS ) { #add the first with http $response_obj->{dslist}->[$j]->{"remap_line"}->{$map_from} = $map_to;
