trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/4] incubator-trafficcontrol git commit: change to require none
Date Tue, 11 Jul 2017 17:20:39 GMT
change to require none


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5e49272b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5e49272b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5e49272b

Branch: refs/heads/master
Commit: 5e49272b230831f30ad21b8c48c60054b1a5fc19
Parents: 4d31f3f
Author: Derek Gelinas <derek_gelinas@cable.comcast.com>
Authored: Wed Jun 21 10:40:01 2017 +0000
Committer: Jeff Elsloo <jeffrey_elsloo@cable.comcast.com>
Committed: Tue Jul 11 11:20:13 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5e49272b/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 a865165..2fb07fb 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -1008,10 +1008,12 @@ sub take_and_bake_server {
 	my $header = $self->header_comment( $server_obj->host_name );
 	my $text;
 	foreach my $parameter ( sort keys %{$data} ) {
-		if ( $parameter eq "no_header" ) {
+		if ( $parameter eq "header" && $data->{$parameter} eq "none" ) {
 			$header = "";
 		}
-		$text .= $data->{$parameter} . "\n";
+		else {
+			$text .= $data->{$parameter} . "\n";
+		}
 	}
 
 	$text =~ s/\s*__RETURN__\s*/\n/g;
@@ -1029,10 +1031,12 @@ sub take_and_bake_profile {
 	my $header = $self->header_comment( $profile_obj->name );
 	my $text;
 	foreach my $parameter ( sort keys %{$data} ) {
-		if ( $parameter eq "no_header" ) {
+		if ( $parameter eq "header" && $data->{$parameter} eq "none" ) {
 			$header = "";
 		}
-		$text .= $data->{$parameter} . "\n";
+		else {
+			$text .= $data->{$parameter} . "\n";
+		}
 	}
 	
 	$text =~ s/\s*__RETURN__\s*/\n/g;


Mime
View raw message