chiark
/
gitweb
/
~ian
/
cgi-auth-flexible.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
21e5e43
)
wip, before remove gettext_from_text_domain
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 28 Dec 2012 12:42:24 +0000
(12:42 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 28 Dec 2012 12:42:24 +0000
(12:42 +0000)
cgi-auth-hybrid.pm
patch
|
blob
|
history
diff --git
a/cgi-auth-hybrid.pm
b/cgi-auth-hybrid.pm
index f8c74ae63789b83927451bd939d761ed0c01a16c..f21a02645f3a2d8f81325d9efb69e16b9956694e 100644
(file)
--- a/
cgi-auth-hybrid.pm
+++ b/
cgi-auth-hybrid.pm
@@
-308,7
+308,7
@@
fixme needs wrapping with something to make and commit a transaction
die unless $parmt;
$r->_db_revoke($cookv);
$r->_db_revoke($parmv);
die unless $parmt;
$r->_db_revoke($cookv);
$r->_db_revoke($parmv);
- return ({ Kind => 'REDIRECT
/
LOGGEDOUT',
+ return ({ Kind => 'REDIRECT
-
LOGGEDOUT',
Message => "Logging out...",
Cookie => '',
Params => [ ] });
Message => "Logging out...",
Cookie => '',
Params => [ ] });
@@
-317,7
+317,7
@@
fixme needs wrapping with something to make and commit a transaction
die unless $meth eq 'GET';
die unless $cookt;
die unless $parmt;
die unless $meth eq 'GET';
die unless $cookt;
die unless $parmt;
- return ({ Kind => 'SMALLPAGE
/
LOGGEDOUT',
+ return ({ Kind => 'SMALLPAGE
-
LOGGEDOUT',
Message => "You have been logged out.",
Cookie => '',
Params => [ ] });
Message => "You have been logged out.",
Cookie => '',
Params => [ ] });
@@
-483,7
+483,7
@@
sub check_ok ($) {
my $cookie = $divert->{Cookie};
my $params = $divert->{Params};
my $cookie = $divert->{Cookie};
my $params = $divert->{Params};
- if ($kind =~ m
#^REDIRECT/#
) {
+ if ($kind =~ m
/^REDIRECT-/
) {
# for redirects, we honour stored NextParams and SetCookie,
# as we would for non-divert
if ($divert_kind eq 'REDIRECT-LOGGEDOUT') {
# for redirects, we honour stored NextParams and SetCookie,
# as we would for non-divert
if ($divert_kind eq 'REDIRECT-LOGGEDOUT') {
@@
-498,7
+498,7
@@
sub check_ok ($) {
$r->_ch('do_redirect')($new_url, $cookie);
return 0;
}
$r->_ch('do_redirect')($new_url, $cookie);
return 0;
}
-
+ if ($kind =~ m/
if (defined $cookie) {
$r->_ch('header_out')($cookie);
if (defined $cookie) {
$r->_ch('header_out')($cookie);