Commit 2580a21f authored by Xavier Guimard's avatar Xavier Guimard

Remove old UA exported var (#1044)

parent 9b9116cf
......@@ -103,7 +103,6 @@
}
},
"exportedVars" : {
"UA" : "HTTP_USER_AGENT"
},
"globalStorage" : "Apache::Session::File",
"globalStorageOptions" : {
......
......@@ -112,7 +112,6 @@
}
},
"exportedVars": {
"UA": "HTTP_USER_AGENT"
},
"globalStorage": "Apache::Session::File",
"globalStorageOptions": {
......
......@@ -21,7 +21,6 @@
}
},
"exportedVars": {
"UA": "HTTP_USER_AGENT"
},
"globalStorage": "Apache::Session::File",
"globalStorageOptions": {
......
......@@ -69,7 +69,7 @@ ok( $res = &client->jsonResponse('/diff/1/2'), 'Diff called' );
my ( @c1, @c2 );
ok( ( @c1 = sort keys %{ $res->[0] } ), 'diff() detects changes in conf 1' );
ok( ( @c2 = sort keys %{ $res->[1] } ), 'diff() detects changes in conf 2' );
ok( @c1 == 12, '12 keys changed in conf 1' )
ok( @c1 == 11, '11 keys changed in conf 1' )
or print STDERR "Expect: 11 keys, get: " . join( ', ', @c1 ) . "\n";
ok( @c2 == 14, '14 keys changed or created in conf 2' )
or print STDERR "Expect: 14 keys, get: " . join( ',', @c2 ) . "\n";
......@@ -120,18 +120,10 @@ sub changes {
'key' => 'openIdSPList',
'new' => '1;bad.com'
},
{
'key' => 'exportedVars',
'new' => 'User-Agent'
},
{
'new' => 'Uid',
'key' => 'exportedVars'
},
{
'key' => 'exportedVars',
'old' => 'UA'
},
{
'key' =>
'locationRules, test1.example.com, (?#Logout comment)^/logout',
......
......@@ -105,7 +105,6 @@
}
},
"exportedVars": {
"UA": "HTTP_USER_AGENT"
},
"globalStorage": "Apache::Session::File",
"globalStorageOptions": {
......
......@@ -1469,12 +1469,7 @@
}, {
"_nodes": [{
"cnodes": "exportedVars",
"default": [{
"data": "HTTP_USER_AGENT",
"id": "exportedVars/UA",
"title": "UA",
"type": "keyText"
}],
"default": [],
"id": "exportedVars",
"title": "exportedVars",
"type": "keyTextContainer"
......
......@@ -1639,21 +1639,11 @@
"id": "variables",
"title": "variables",
"nodes": [{
"default": [{
"data": "HTTP_USER_AGENT",
"id": "exportedVars/UA",
"title": "UA",
"type": "keyText"
}],
"default": [],
"id": "exportedVars",
"title": "exportedVars",
"type": "keyTextContainer",
"nodes": [{
"data": "HTTP_USER_AGENT",
"type": "keyText",
"id": "exportedVars/UA",
"title": "UA"
}]
"nodes": []
}, {
"default": [],
"id": "macros",
......
......@@ -1650,21 +1650,11 @@
"id": "variables",
"title": "variables",
"nodes": [{
"default": [{
"data": "HTTP_USER_AGENT",
"id": "exportedVars/UA",
"title": "UA",
"type": "keyText"
}],
"default": [],
"id": "exportedVars",
"title": "exportedVars",
"type": "keyTextContainer",
"nodes": [{
"data": "HTTP_USER_AGENT",
"type": "keyText",
"id": "exportedVars/UA",
"title": "UserAgent"
}, {
"data": "uid",
"type": "keyText",
"id": "exportedVars/n3",
......
......@@ -1639,21 +1639,11 @@
"id": "variables",
"title": "variables",
"nodes": [{
"default": [{
"data": "HTTP_USER_AGENT",
"id": "exportedVars/UA",
"title": "UA",
"type": "keyText"
}],
"default": [],
"id": "exportedVars",
"title": "exportedVars",
"type": "keyTextContainer",
"nodes": [{
"data": "HTTP_USER_AGENT",
"type": "keyText",
"id": "exportedVars/UA",
"title": "UA"
}]
"nodes": []
}, {
"default": [],
"id": "macros",
......
......@@ -2380,12 +2380,7 @@
{
"_nodes": [{
"cnodes": "exportedVars",
"default": [{
"data": "HTTP_USER_AGENT",
"id": "exportedVars/UA",
"title": "UA",
"type": "keyText"
}],
"default": [],
"help": "exportedvars.html",
"id": "exportedVars",
"title": "exportedVars",
......
......@@ -319,15 +319,6 @@ sub setSessionInfo {
if $self->conf->{timeoutActivity};
}
# Get environment variables matching exportedVars (works only with HTTP_*
# and SSL_*: see Main/Request.pm)
foreach ( keys %{ $self->conf->{exportedVars} } ) {
if ( my $tmp = $req->{ $self->conf->{exportedVars}->{$_} } ) {
$tmp =~ s/[\r\n]/ /gs;
$req->{sessionInfo}->{$_} = $tmp;
}
}
# Store URL origin in session
$req->{sessionInfo}->{_url} = $req->{urldc};
......
......@@ -7,7 +7,7 @@ BEGIN {
require 't/test-lib.pm';
}
my $debug = 'debug';
my $debug = 'error';
my ( $issuer, $sp, $res );
my %handlerOR = ( issuer => [], sp => [] );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment