From 3397af1fd7971910021122bf14d481abcf748fef Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 25 Oct 2015 13:34:31 +0000 Subject: [PATCH] blinding: Move another setting of Params into check_divert Previously, divert_ok had the knowledge of the need to set the first of loggedout_param_names. Put this into check_divert. Signed-off-by: Ian Jackson --- cgi-auth-flexible.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm index 7542b21..8eeea92 100644 --- a/cgi-auth-flexible.pm +++ b/cgi-auth-flexible.pm @@ -819,7 +819,9 @@ sub _check_divert_core ($) { return ({ Kind => 'REDIRECT-LOGGEDOUT', Message => $r->_gt("Logging out..."), _CookieRaw => '', - Params => { } }); + Params => { + $r->{S}{loggedout_param_names}[0] => [ 1 ], + } }); } if ($r->_ch('is_loggedout')) { die unless $meth eq 'GET'; @@ -1100,7 +1102,6 @@ sub check_ok ($) { # for redirects, we honour stored Params and Cookie, # as we would for non-divert if ($kind eq 'REDIRECT-LOGGEDOUT') { - $params->{$r->{S}{loggedout_param_names}[0]} = [ 1 ]; } elsif ($kind eq 'REDIRECT-LOGOUT') { $params->{$r->{S}{logout_param_names}[0]} = [ 1 ]; } elsif ($kind =~ m/REDIRECT-(?:LOGGEDIN|HTTPS)/) { -- 2.30.2