r3154 - in /packages/libapache-session-perl/trunk: CHANGES META.yml
Session.pm Session/Flex.pm debian/changelog debian/control
t/99flex.t
eloy at users.alioth.debian.org
eloy at users.alioth.debian.org
Thu Jun 22 14:40:17 UTC 2006
Author: eloy
Date: Thu Jun 22 14:40:16 2006
New Revision: 3154
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=3154
Log:
eloy: new upstream version
Modified:
packages/libapache-session-perl/trunk/CHANGES
packages/libapache-session-perl/trunk/META.yml
packages/libapache-session-perl/trunk/Session.pm
packages/libapache-session-perl/trunk/Session/Flex.pm
packages/libapache-session-perl/trunk/debian/changelog
packages/libapache-session-perl/trunk/debian/control
packages/libapache-session-perl/trunk/t/99flex.t
Modified: packages/libapache-session-perl/trunk/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/CHANGES?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/CHANGES (original)
+++ packages/libapache-session-perl/trunk/CHANGES Thu Jun 22 14:40:16 2006
@@ -1,3 +1,8 @@
+1.81 2006-05-23
+
+ - Don't unconditionally try to require packages in Apache::Session::Flex
+ (Dave Rolsky).
+
1.8 2005-10-06
- Bug fix to stop death in Apache::Session::Lock::Semaphore.
Modified: packages/libapache-session-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/META.yml?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/META.yml (original)
+++ packages/libapache-session-perl/trunk/META.yml Thu Jun 22 14:40:16 2006
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Apache-Session
-version: 1.80
+version: 1.81
version_from: Session.pm
installdirs: site
requires:
Modified: packages/libapache-session-perl/trunk/Session.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/Session.pm?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/Session.pm (original)
+++ packages/libapache-session-perl/trunk/Session.pm Thu Jun 22 14:40:16 2006
@@ -312,7 +312,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '1.80';
+$VERSION = '1.81';
#State constants
#
Modified: packages/libapache-session-perl/trunk/Session/Flex.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/Session/Flex.pm?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/Session/Flex.pm (original)
+++ packages/libapache-session-perl/trunk/Session/Flex.pm Thu Jun 22 14:40:16 2006
@@ -10,12 +10,10 @@
package Apache::Session::Flex;
use strict;
-use vars qw(@ISA $VERSION $incl);
+use vars qw(@ISA $VERSION);
$VERSION = '1.01';
@ISA = qw(Apache::Session);
-
-$incl = {};
use Apache::Session;
@@ -27,34 +25,29 @@
my $gen = "Apache::Session::Generate::$self->{args}->{Generate}";
my $ser = "Apache::Session::Serialize::$self->{args}->{Serialize}";
- if (!exists $incl->{$store}) {
- eval "require $store" || die $@;
- $incl->{$store} = 1;
+ for my $class ($store, $lock) {
+ unless ($class->can('new')) {
+ eval "require $class" || die $@;
+ }
}
-
- if (!exists $incl->{$lock}) {
- eval "require $lock" || die $@;
- $incl->{$lock} = 1;
+
+ unless ($gen->can('validate')) {
+ eval "require $gen" || die $@;
}
-
- if (!exists $incl->{$gen}) {
- eval "require $gen" || die $@;
- eval '$incl->{$gen}->[0] = \&' . $gen . '::generate' || die $@;
- eval '$incl->{$gen}->[1] = \&' . $gen . '::validate' || die $@;
+
+ unless ($ser->can('serialize')) {
+ eval "require $ser" || die $@;
}
-
- if (!exists $incl->{$ser}) {
- eval "require $ser" || die $@;
- eval '$incl->{$ser}->[0] = \&' . $ser . '::serialize' || die $@;
- eval '$incl->{$ser}->[1] = \&' . $ser . '::unserialize' || die $@;
- }
-
+
$self->{object_store} = new $store $self;
$self->{lock_manager} = new $lock $self;
- $self->{generate} = $incl->{$gen}->[0];
- $self->{validate} = $incl->{$gen}->[1];
- $self->{serialize} = $incl->{$ser}->[0];
- $self->{unserialize} = $incl->{$ser}->[1];
+ {
+ no strict 'refs';
+ $self->{generate} = \&{$gen . '::generate'};
+ $self->{validate} = \&{$gen . '::validate'};
+ $self->{serialize} = \&{$ser . '::serialize'};
+ $self->{unserialize} = \&{$ser . '::unserialize'};
+ }
return $self;
}
Modified: packages/libapache-session-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/debian/changelog?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/debian/changelog (original)
+++ packages/libapache-session-perl/trunk/debian/changelog Thu Jun 22 14:40:16 2006
@@ -1,3 +1,12 @@
+libapache-session-perl (1.81-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ - Uploaders: added me
+ - Description: changed 'this module' to 'Apache::Session'
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org> Thu, 22 Jun 2006 16:37:15 +0200
+
libapache-session-perl (1.80-3) unstable; urgency=low
* Moved debhelper to Build-Depends.
Modified: packages/libapache-session-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/debian/control?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/debian/control (original)
+++ packages/libapache-session-perl/trunk/debian/control Thu Jun 22 14:40:16 2006
@@ -1,6 +1,6 @@
Source: libapache-session-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Joachim Breitner <nomeata at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>, Carlo Segre <segre at debian.org>
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Joachim Breitner <nomeata at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>, Carlo Segre <segre at debian.org>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
Priority: optional
Section: perl
Build-Depends: debhelper (>= 5.0.0)
@@ -13,6 +13,6 @@
Section: perl
Depends: ${perl:Depends}, perl (>= 5.8) | libstorable-perl, perl (>= 5.8) | libdigest-md5-perl
Description: Perl modules for keeping persistent user data across http requests
- This module makes maintaining user data across http requests simple.
+ Apache::Session makes maintaining user data across http requests simple.
It's usable from both mod_perl scripts and more traditional perl CGI
scripts.
Modified: packages/libapache-session-perl/trunk/t/99flex.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99flex.t?rev=3154&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99flex.t (original)
+++ packages/libapache-session-perl/trunk/t/99flex.t Thu Jun 22 14:40:16 2006
@@ -16,7 +16,7 @@
my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
chdir( $tempdir );
-plan tests => 11;
+plan tests => 12;
my $package = 'Apache::Session::Flex';
use_ok $package;
@@ -49,4 +49,48 @@
is ref($session->{unserialize}), 'CODE', 'unserialize is CODE';
}
+{
+ {
+ package Apache::Session::Store::Test;
+ use base 'Apache::Session::Store::File';
+ }
+
+ {
+ package Apache::Session::Lock::Test;
+ use base 'Apache::Session::Lock::File';
+ }
+
+ {
+ package Apache::Session::Generate::Test;
+
+ # This wack double assignment prevents "... used only once"
+ # warnings.
+ *Apache::Session::Generate::Test::generate =
+ *Apache::Session::Generate::Test::generate =
+ \&Apache::Session::Generate::MD5::generate;
+ *Apache::Session::Generate::Test::validate =
+ *Apache::Session::Generate::Test::validate =
+ \&Apache::Session::Generate::MD5::validate;
+ }
+
+ {
+ package Apache::Session::Serialize::Test;
+
+ *Apache::Session::Serialize::Test::serialize =
+ *Apache::Session::Serialize::Test::serialize =
+ \&Apache::Session::Serialize::Storable::serialize;
+ *Apache::Session::Serialize::Test::unserialize =
+ *Apache::Session::Serialize::Test::unserialize =
+ \&Apache::Session::Serialize::Storable::unserialize;
+ }
+
+ my $session = tie my %session, $package, undef, {
+ Store => 'Test',
+ Lock => 'Test',
+ Generate => 'Test',
+ Serialize => 'Test',
+ };
+ isa_ok $session->{object_store}, 'Apache::Session::Store::Test';
+}
+
chdir( $origdir );
More information about the Pkg-perl-cvs-commits
mailing list