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 (parent:
945f603
)
wip, DEBUGGING
author
Ian Jackson
<ian.jackson@eu.citrix.com>
Mon, 7 Jan 2013 18:16:40 +0000
(18:16 +0000)
committer
Ian Jackson
<Ian.Jackson@eu.citrix.com>
Mon, 7 Jan 2013 18:16:40 +0000
(18:16 +0000)
cgi-auth-hybrid.pm
patch
|
blob
|
history
diff --git
a/cgi-auth-hybrid.pm
b/cgi-auth-hybrid.pm
index a80ab852063f0ca652d7e1d1feb39ecf38811f23..4f74cded4fe0e89a99f258640757b1cc4f03e000 100644
(file)
--- a/
cgi-auth-hybrid.pm
+++ b/
cgi-auth-hybrid.pm
@@
-238,21
+238,31
@@
sub _db_transaction ($$) {
my $retries = 10;
my $rv;
my $dbh = $v->{Dbh};
my $retries = 10;
my $rv;
my $dbh = $v->{Dbh};
+#print STDERR "DT entry\n";
for (;;) {
for (;;) {
+#print STDERR "DT loop\n";
if (!eval {
$rv = $fn->();
if (!eval {
$rv = $fn->();
+#print STDERR "DT fn ok\n";
1;
}) {
1;
}) {
+#print STDERR "DT fn error\n";
{ local ($@); $dbh->rollback(); }
{ local ($@); $dbh->rollback(); }
+#print STDERR "DT fn throwing\n";
die $@;
}
die $@;
}
+#print STDERR "DT fn eval ok\n";
if (eval {
$dbh->commit();
if (eval {
$dbh->commit();
+print STDERR "DT commit ok\n";
1;
}) {
1;
}) {
+print STDERR "DT commit eval ok\n";
return $rv;
}
return $rv;
}
+print STDERR "DT commit throw?\n";
die $@ if !--$retries;
die $@ if !--$retries;
+print STDERR "DT loop again\n";
}
}
}
}
@@
-292,12
+302,15
@@
sub _print ($$) { my ($r, @t) = @_; return $r->_ch('print', join '', @t); }
sub construct_cookie ($$$) {
my ($r, $cookv) = @_;
return undef unless $cookv;
sub construct_cookie ($$$) {
my ($r, $cookv) = @_;
return undef unless $cookv;
- return $r->{Cgi}->cookie(-name => $r->{S}{cookie_name},
+ my $c = $r->{Cgi};
+ my $cookt = $c->cookie(-name => $r->{S}{cookie_name},
-value => $cookv,
-path => $r->{S}{cookie_path},
-domain => $r->_ch('get_cookie_domain'),
-expires => '+'.$r->{S}{login_timeout}.'s',
-secure => $r->{S}{encrypted_only});
-value => $cookv,
-path => $r->{S}{cookie_path},
-domain => $r->_ch('get_cookie_domain'),
-expires => '+'.$r->{S}{login_timeout}.'s',
-secure => $r->{S}{encrypted_only});
+print STDERR "CC $r $c $cookv $cookt\n";
+ return $cookt;
}
# pages/param-sets are
}
# pages/param-sets are
@@
-703,7
+716,10
@@
sub secret_hidden_html ($) {
sub secret_cookie ($) {
my ($r) = @_;
sub secret_cookie ($) {
my ($r) = @_;
- return $r->construct_cookie($r->secret_val());
+print STDERR "SC\n";
+ my $cookv = $r->construct_cookie($r->secret_val());
+print STDERR "SC=$cookv\n";
+ return $cookv;
}
__END__
}
__END__