You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/05/03 19:07:30 UTC
[1/2] incubator-trafficcontrol git commit: transpose psel order
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 52be3ef06 -> e2274a0c1
transpose psel order
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8738167c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8738167c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8738167c
Branch: refs/heads/master
Commit: 8738167c87a88653824b7a0416ef59bf980d9ffd
Parents: 52be3ef
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Wed May 3 15:03:12 2017 -0400
Committer: Derek Gelinas <de...@cable.comcast.com>
Committed: Wed May 3 15:03:12 2017 -0400
----------------------------------------------------------------------
traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 12 ++++++------
traffic_ops/app/lib/UI/ConfigFiles.pm | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8738167c/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 36f58ff..6a699e2 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -2038,14 +2038,14 @@ sub parent_dot_config {
$text .= "dest_domain=" . $org_uri->host . " port=" . $org_uri->port . " go_direct=true\n";
}
else {
- # check for delivery service psel.qstring_handling. If this parameter is assigned to the delivery service profile,
+ # check for profile psel.qstring_handling. If this parameter is assigned to the server profile,
# then edges will use the qstring handling value specified in the parameter for all profiles.
- my $qsh = $ds->{'param'}->{'parent.config'}->{'psel.qstring_handling'};
- # If there is no defined parameter in the delivery service, then check the server's profile.
- # If psel.qstring_handling exists in the profile, then we use that value for the specified profile only.
- # This is used only if not overridden by a delivery service profile qstring handling parameter.
+ my $qsh = $self->profile_param_value( $server_obj->profile->id, 'parent.config', 'psel.qstring_handling');
+ # If there is no defined parameter in the profile, then check the delivery service profile.
+ # If psel.qstring_handling exists in the DS profile, then we use that value for the specified DS only.
+ # This is used only if not overridden by a server profile qstring handling parameter.
if (!defined($qsh)) {
- $qsh = $self->profile_param_value( $server_obj->profile->id, 'parent.config', 'psel.qstring_handling');
+ $qsh = $ds->{'param'}->{'parent.config'}->{'psel.qstring_handling'};
}
my $parent_qstring = defined($qsh) ? $qsh : "ignore";
if ( $ds->{qstring_ignore} == 0 && !defined($qsh) ) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8738167c/traffic_ops/app/lib/UI/ConfigFiles.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index 3bf2020..49ca73c 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -1207,14 +1207,14 @@ sub parent_dot_config {
$text .= "dest_domain=" . $org_uri->host . " port=" . $org_uri->port . " go_direct=true\n";
}
else {
- # check for delivery service psel.qstring_handling. If this parameter is assigned to the delivery service profile,
+ # check for profile psel.qstring_handling. If this parameter is assigned to the server profile,
# then edges will use the qstring handling value specified in the parameter for all profiles.
- my $qsh = $remap->{'param'}->{'parent.config'}->{'psel.qstring_handling'};
- # If there is no defined parameter in the delivery service, then check the server's profile.
- # If psel.qstring_handling exists in the profile, then we use that value for the specified profile only.
- # This is used only if not overridden by a delivery service profile qstring handling parameter.
+ my $qsh = $self->profile_param_value( $server->profile->id, 'parent.config', 'psel.qstring_handling');
+ # If there is no defined parameter in the profile, then check the delivery service profile.
+ # If psel.qstring_handling exists in the DS profile, then we use that value for the specified DS only.
+ # This is used only if not overridden by a server profile qstring handling parameter.
if (!defined($qsh)) {
- $qsh = $self->profile_param_value( $server->profile->id, 'parent.config', 'psel.qstring_handling');
+ $qsh = $remap->{'param'}->{'parent.config'}->{'psel.qstring_handling'};
}
my $parent_qstring = defined($qsh) ? $qsh : "ignore";
if ( $remap->{qstring_ignore} == 0 && !defined($qsh) ) {
[2/2] incubator-trafficcontrol git commit: This closes #542
Posted by ne...@apache.org.
This closes #542
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e2274a0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e2274a0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e2274a0c
Branch: refs/heads/master
Commit: e2274a0c15f89a5f810ca985277123d731190d9c
Parents: 8738167
Author: David Neuman <da...@gmail.com>
Authored: Wed May 3 13:07:14 2017 -0600
Committer: David Neuman <da...@gmail.com>
Committed: Wed May 3 13:07:14 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------