Zirkuläre Referenzen in $::auth auflösen, damit DB-Verbindung am Ende des Requests...

Conflicts:

	SL/Auth/DB.pm

diff --git a/SL/Auth/DB.pm b/SL/Auth/DB.pm
index 0168896f9f4ef2bba9c34f4547613324740f6a66..dd6350623f1a7451c1e187b5d727185652eebe5a 100644 (file)
--- a/SL/Auth/DB.pm
+++ b/SL/Auth/DB.pm
@@ -3,6 +3,7 @@ package SL::Auth::DB;
 use strict;
 
 use Carp;
+use Scalar::Util qw(weaken);
 
 use SL::Auth::Constants qw(:all);
 use SL::DBUtils;
@@ -14,6 +15,7 @@ sub new {
   my $self = {};
 
   $self->{auth} = shift;
+  weaken $self->{auth};
 
   bless $self, $type;
 

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index b485063421f6a68de0820b5d1be5f02b9c06ab6f..a2aa87e85eb6b85723f04971eec8229c5b647dac 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -231,6 +231,7 @@ sub handle_request {
   # cleanup
   $::locale   = undef;
   $::form     = undef;
+  $::auth     = undef;
   $::myconfig = ();
   Form::disconnect_standard_dbh;
   $::auth->expire_session_keys->save_session;