Revert "Fix duplicate headers & update unit test (#1863)"

This reverts commit c7e7a2bd86.
environments/ppa-mbqj77/deployments/795^2
Christophe Maudoux 6 years ago
parent c7e7a2bd86
commit 323a6a027c
  1. 13
      lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Server.pm
  2. 13
      lemonldap-ng-handler/t/65-Lemonldap-NG-Handler-PSGI-ServiceToken.t

@ -26,17 +26,8 @@ sub _run {
return sub {
my $req = Lemonldap::NG::Common::PSGI::Request->new( $_[0] );
my $res = $self->_authAndTrace($req);
# Insert respHeaders in response only if not already set
my %hdr1 = @{ $res->[1] };
my %hdr2 = @{ $req->{respHeaders} };
foreach ( keys %hdr2 ) {
unless ( $hdr1{$_} and $hdr2{$_} eq $hdr1{$_} ) {
push @{ $res->[1] }, ( $_ => $hdr2{$_} );
}
}
push @{ $res->[1] }, Cookie => ( $req->{Cookie} // '' );
push @{ $res->[1] }, @{ $req->respHeaders },
Cookie => ( $req->{Cookie} // '' );
return $res;
};
}

@ -1,5 +1,4 @@
use Test::More;
use Data::Dumper;
BEGIN {
require 't/test-psgi-lib.pm';
@ -54,9 +53,9 @@ count(2);
my @headers = grep { /service|^XFromVH$/ } @{ $res->[1] };
my @values = grep { /\.example\.com|^$sessionId$/ } @{ $res->[1] };
ok( @headers == 2, 'Found 2 service headers' )
ok( @headers == 4, 'Found 4 service headers' )
or print STDERR Data::Dumper::Dumper( $res->[1] );
ok( @values == 2, 'Found 2 service header values' )
ok( @values == 4, 'Found 4 service header values' )
or print STDERR Data::Dumper::Dumper( $res->[1] );
count(2);
@ -76,9 +75,9 @@ count(2);
@headers = grep { /service|^XFromVH$/ } @{ $res->[1] };
@values = grep { /\.example\.com|^$sessionId$/ } @{ $res->[1] };
ok( @headers == 2, 'Found 2 service headers' )
ok( @headers == 4, 'Found 4 service headers' )
or print STDERR Data::Dumper::Dumper( $res->[1] );
ok( @values == 2, 'Found 2 service header values' )
ok( @values == 4, 'Found 4 service header values' )
or print STDERR Data::Dumper::Dumper( $res->[1] );
count(2);
@ -117,9 +116,9 @@ count(2);
@headers = grep { /service|^XFromVH$/ } @{ $res->[1] };
@values = grep { /\.example\.com|^$sessionId$/ } @{ $res->[1] };
ok( @headers == 2, 'Found 2 service headers' )
ok( @headers == 4, 'Found 4 service headers' )
or print STDERR Data::Dumper::Dumper( $res->[1] );
ok( @values == 2, 'Found 2 service header values' )
ok( @values == 4, 'Found 4 service header values' )
or print STDERR Data::Dumper::Dumper( $res->[1] );
count(2);

Loading…
Cancel
Save