From 7ce770ddc5d4caed4abd7c3026ea18a1dfdfbbdd Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 5 Oct 2018 10:25:43 +0200 Subject: [PATCH] Bug 17776: (QA follow-up) Consistent regex for Plack detection Synchronizing: C4/Auth_with_shibboleth.pm: if ( any { /(^psgi|^plack)/i } keys %ENV ) { Koha/AuthUtils.pm: if ( ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) { about.pl:if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) { Actually we should move it to a subroutine. New report please. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- C4/Auth_with_shibboleth.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm index dc18a1fa4c..480d5d8d32 100644 --- a/C4/Auth_with_shibboleth.pm +++ b/C4/Auth_with_shibboleth.pm @@ -84,7 +84,7 @@ sub get_login_shib { my $matchAttribute = $config->{mapping}->{ $config->{matchpoint} }->{is}; - if ( any { /(^psgi|^plack)/i } keys %ENV ) { + if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) { $debug and warn $matchAttribute . " value: " . $ENV{"HTTP_".uc($matchAttribute)}; return $ENV{"HTTP_".uc($matchAttribute)} || ''; } else { -- 2.39.5