Attachment #46924 for bug #71935

View | Details | Raw Unified | Return to bug 71935
Collapse All | Expand All




#

PORTNAME=	Apache-Session
PORTVERSION=	1.60
PORTREVISION=	2
CATEGORIES=	www perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	Apache
PKGNAMEPREFIX=	p5-
DISTNAME=	${PORTNAME}-${PORTVERSION:S/0//}

MAINTAINER=	frank@exit.com
COMMENT=	A persistence framework for session data


PERL_CONFIGURE=	yes

MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3=		Apache::Session.3 \
		Apache::Session::DB_File.3 \
		Apache::Session::File.3 \

		Apache::Session::Generate::MD5.3 \
		Apache::Session::Generate::ModUniqueId.3 \
		Apache::Session::Generate::ModUsertrack.3 \
		Apache::Session::Informix.3 \
		Apache::Session::Lock::File.3 \
		Apache::Session::Lock::MySQL.3 \
		Apache::Session::Lock::Null.3 \
		Apache::Session::Lock::Semaphore.3 \
		Apache::Session::Lock::Sybase.3 \
		Apache::Session::MySQL.3 \
		Apache::Session::Oracle.3 \
		Apache::Session::Postgres.3 \

		Apache::Session::Serialize::UUEncode.3 \
		Apache::Session::Store::DB_File.3 \
		Apache::Session::Store::File.3 \
		Apache::Session::Store::Informix.3 \
		Apache::Session::Store::MySQL.3 \
		Apache::Session::Store::Oracle.3 \
		Apache::Session::Store::Postgres.3 \

.include <bsd.port.pre.mk>

.if ${PERL_LEVEL} < 500800
BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
.if ${PERL_LEVEL} < 500600
EXTRA_PATCH=	${PATCHDIR}/5.005-Session::Generate::ModUniqueId.pm

post-patch:
	@${FIND} ${WRKSRC} -name '*.orig' -delete
.endif
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (Apache-Session-1.54.tar.gz) = 6d327a8388a58260e10f5f7fc1c79123	1	MD5 (Apache-Session-1.6.tar.gz) = 3a373102e3ba49f93a76994c6599e1ff
2	SIZE (Apache-Session-1.54.tar.gz) = 27355	2	SIZE (Apache-Session-1.6.tar.gz) = 29391




%%SITE_PERL%%/Apache/Session/DB_File.pm
%%SITE_PERL%%/Apache/Session/File.pm
%%SITE_PERL%%/Apache/Session/Flex.pm
%%SITE_PERL%%/Apache/Session/MySQL.pm
%%SITE_PERL%%/Apache/Session/Oracle.pm
%%SITE_PERL%%/Apache/Session/Postgres.pm
%%SITE_PERL%%/Apache/Session/Sybase.pm
%%SITE_PERL%%/Apache/Session/Generate/MD5.pm
%%SITE_PERL%%/Apache/Session/Generate/ModUniqueId.pm
%%SITE_PERL%%/Apache/Session/Generate/ModUsertrack.pm
%%SITE_PERL%%/Apache/Session/Informix.pm
%%SITE_PERL%%/Apache/Session/Lock/File.pm
%%SITE_PERL%%/Apache/Session/Lock/File.pm.orig
%%SITE_PERL%%/Apache/Session/Lock/MySQL.pm
%%SITE_PERL%%/Apache/Session/Lock/Null.pm
%%SITE_PERL%%/Apache/Session/Lock/Semaphore.pm
%%SITE_PERL%%/Apache/Session/Lock/Sybase.pm
%%SITE_PERL%%/Apache/Session/MySQL.pm
%%SITE_PERL%%/Apache/Session/Oracle.pm
%%SITE_PERL%%/Apache/Session/Postgres.pm
%%SITE_PERL%%/Apache/Session/Serialize/Base64.pm
%%SITE_PERL%%/Apache/Session/Serialize/Storable.pm
%%SITE_PERL%%/Apache/Session/Serialize/Sybase.pm

%%SITE_PERL%%/Apache/Session/Store/DBI.pm
%%SITE_PERL%%/Apache/Session/Store/DB_File.pm
%%SITE_PERL%%/Apache/Session/Store/File.pm
%%SITE_PERL%%/Apache/Session/Store/Informix.pm
%%SITE_PERL%%/Apache/Session/Store/MySQL.pm
%%SITE_PERL%%/Apache/Session/Store/Oracle.pm
%%SITE_PERL%%/Apache/Session/Store/Postgres.pm
%%SITE_PERL%%/Apache/Session/Store/Sybase.pm
%%SITE_PERL%%/Apache/Session/Sybase.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
@dirrm %%SITE_PERL%%/Apache/Session/Store
@dirrm %%SITE_PERL%%/Apache/Session/Serialize
@dirrm %%SITE_PERL%%/Apache/Session/Lock
@dirrm %%SITE_PERL%%/Apache/Session/Generate
@dirrm %%SITE_PERL%%/Apache/Session
@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true

Added Link Here

(-)files/5.005-Session::Generate::ModUniqueId.pm (+11 lines)
1	--- Session/Generate/ModUniqueId.pm~ Mon Sep 20 14:27:20 2004
2	+++ Session/Generate/ModUniqueId.pm Mon Sep 20 14:27:31 2004
3	@@ -8,7 +8,7 @@
4	my $session = shift;
5	unless (exists $ENV{UNIQUE_ID}) {
6	require Carp;
7	- Carp::croak 'Can\'t get UNIQUE_ID env variable. Make sure mod_unique_id is enabled.';
8	+ Carp::croak('Can\'t get UNIQUE_ID env variable. Make sure mod_unique_id is enabled.');
9	}
10	$session->{data}->{_session_id} = $ENV{UNIQUE_ID};
11	}




--- Session/Lock/File.pm.orig	Sat Sep  2 00:21:17 2000
+++ Session/Lock/File.pm	Thu Dec  6 17:37:40 2001
@@ -36,8 +36,9 @@
         
         my $LockDirectory = $session->{args}->{LockDirectory} || 
             $Apache::Session::Lock::File::LockDirectory;
+        my $LockFile = $LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock";
             
-        open($fh, "+>".$LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock") || die $!;
+        open($fh, "+> $LockFile") || die "$LockFile: $!";
 
         $self->{fh} = $fh;
         $self->{opened} = 1;
@@ -58,8 +59,9 @@
         
         my $LockDirectory = $session->{args}->{LockDirectory} || 
             $Apache::Session::Lock::File::LockDirectory;
+        my $LockFile = $LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock";
             
-        open($fh, "+>".$LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock") || die $!;
+        open($fh, "+> $LockFile") || die "$LockFile: $!";
 
         $self->{fh} = $fh;
         $self->{opened} = 1;




--- Session/Store/File.pm.orig	Mon Jul 24 05:44:52 2000
+++ Session/Store/File.pm	Thu Dec  6 17:49:31 2001
@@ -33,13 +33,14 @@
     my $session = shift;
  
     my $directory = $session->{args}->{Directory} || $Apache::Session::Store::File::Directory;
+    my $file = $directory.'/'.$session->{data}->{_session_id};
 
-    if (-e $directory.'/'.$session->{data}->{_session_id}) {
-        die "Object already exists in the data store";
+    if (-e $file) {
+        die "Object already exists in the data store: $file";
     }
     
-    sysopen ($self->{fh}, $directory.'/'.$session->{data}->{_session_id}, O_RDWR|O_CREAT) ||
-        die "Could not open file: $!";
+    sysopen ($self->{fh}, $file, O_RDWR|O_CREAT) ||
+        die "Could not open $file: $!";
 
     $self->{opened} = 1;
     
@@ -51,10 +52,11 @@
     my $session = shift;
     
     my $directory = $session->{args}->{Directory} || $Apache::Session::Store::File::Directory;
+    my $file = $directory.'/'.$session->{data}->{_session_id};
 
     if (!$self->{opened}) {
-        sysopen ($self->{fh}, $directory.'/'.$session->{data}->{_session_id}, O_RDWR|O_CREAT) ||
-            die "Could not open file: $!";
+        sysopen ($self->{fh}, $file, O_RDWR|O_CREAT) ||
+            die "Could not open $file: $!";
         
         $self->{opened} = 1;
     }
@@ -69,11 +71,12 @@
     my $session = shift;
     
     my $directory = $session->{args}->{Directory} || $Apache::Session::Store::File::Directory;
+    my $file = $directory.'/'.$session->{data}->{_session_id};
     
-    if (-e $directory.'/'.$session->{data}->{_session_id}) {
+    if (-e $file) {
         if (!$self->{opened}) {
-            sysopen ($self->{fh}, $directory.'/'.$session->{data}->{_session_id}, O_RDWR|O_CREAT) ||
-                die "Could not open file: $!";
+            sysopen ($self->{fh}, $file, O_RDWR|O_CREAT) ||
+                die "Could not open $file: $!";
 
             $self->{opened} = 1;
         }
@@ -96,15 +99,16 @@
     my $session = shift;
         
     my $directory = $session->{args}->{Directory} || $Apache::Session::Store::File::Directory;
+    my $file = $directory.'/'.$session->{data}->{_session_id};
 
     if ($self->{opened}) {
         CORE::close $self->{fh};
         $self->{opened} = 0;
     }
 
-    if (-e $directory.'/'.$session->{data}->{_session_id}) {
-        unlink ($directory.'/'.$session->{data}->{_session_id}) ||
-            die "Could not remove file: $!";
+    if (-e $file) {
+        unlink ($file) ||
+            die "Could not remove $file: $!";
     }
     else {
         die "Object does not exist in the data store";

Return to bug 71935

Lines 6-17 Link Here

(-)Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= Apache-Session	8	PORTNAME= Apache-Session
9	PORTVERSION= 1.54	9	PORTVERSION= 1.60
10	PORTREVISION= 2
11	CATEGORIES= www perl5	10	CATEGORIES= www perl5
12	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
13	MASTER_SITE_SUBDIR= Apache	12	MASTER_SITE_SUBDIR= Apache
14	PKGNAMEPREFIX= p5-	13	PKGNAMEPREFIX= p5-
		14	DISTNAME= ${PORTNAME}-${PORTVERSION:S/0//}
15		15
16	MAINTAINER= frank@exit.com	16	MAINTAINER= frank@exit.com
17	COMMENT= A persistence framework for session data	17	COMMENT= A persistence framework for session data
Lines 21-27 Link Here
21		21
22	PERL_CONFIGURE= yes	22	PERL_CONFIGURE= yes
23		23
24	MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
25	MAN3= Apache::Session.3 \	24	MAN3= Apache::Session.3 \
26	Apache::Session::DB_File.3 \	25	Apache::Session::DB_File.3 \
27	Apache::Session::File.3 \	26	Apache::Session::File.3 \
Lines 29-38 Link Here
29	Apache::Session::Generate::MD5.3 \	28	Apache::Session::Generate::MD5.3 \
30	Apache::Session::Generate::ModUniqueId.3 \	29	Apache::Session::Generate::ModUniqueId.3 \
31	Apache::Session::Generate::ModUsertrack.3 \	30	Apache::Session::Generate::ModUsertrack.3 \
		31	Apache::Session::Informix.3 \
32	Apache::Session::Lock::File.3 \	32	Apache::Session::Lock::File.3 \
33	Apache::Session::Lock::MySQL.3 \	33	Apache::Session::Lock::MySQL.3 \
34	Apache::Session::Lock::Null.3 \	34	Apache::Session::Lock::Null.3 \
35	Apache::Session::Lock::Semaphore.3 \	35	Apache::Session::Lock::Semaphore.3 \
		36	Apache::Session::Lock::Sybase.3 \
36	Apache::Session::MySQL.3 \	37	Apache::Session::MySQL.3 \
37	Apache::Session::Oracle.3 \	38	Apache::Session::Oracle.3 \
38	Apache::Session::Postgres.3 \	39	Apache::Session::Postgres.3 \
Lines 42-47 Link Here
42	Apache::Session::Serialize::UUEncode.3 \	43	Apache::Session::Serialize::UUEncode.3 \
43	Apache::Session::Store::DB_File.3 \	44	Apache::Session::Store::DB_File.3 \
44	Apache::Session::Store::File.3 \	45	Apache::Session::Store::File.3 \
		46	Apache::Session::Store::Informix.3 \
45	Apache::Session::Store::MySQL.3 \	47	Apache::Session::Store::MySQL.3 \
46	Apache::Session::Store::Oracle.3 \	48	Apache::Session::Store::Oracle.3 \
47	Apache::Session::Store::Postgres.3 \	49	Apache::Session::Store::Postgres.3 \
Lines 51-57 Link Here
51	.include <bsd.port.pre.mk>	53	.include <bsd.port.pre.mk>
52		54
53	.if ${PERL_LEVEL} < 500800	55	.if ${PERL_LEVEL} < 500800
54	BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable	56	BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
		57	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
		58	.if ${PERL_LEVEL} < 500600
		59	EXTRA_PATCH= ${PATCHDIR}/5.005-Session::Generate::ModUniqueId.pm
		60
		61	post-patch:
		62	@${FIND} ${WRKSRC} -name '*.orig' -delete
		63	.endif
55	.endif	64	.endif
56		65
57	.include <bsd.port.post.mk>	66	.include <bsd.port.post.mk>

Lines 2-19 Link Here

(-)pkg-plist (-6 / +9 lines)
2	%%SITE_PERL%%/Apache/Session/DB_File.pm	2	%%SITE_PERL%%/Apache/Session/DB_File.pm
3	%%SITE_PERL%%/Apache/Session/File.pm	3	%%SITE_PERL%%/Apache/Session/File.pm
4	%%SITE_PERL%%/Apache/Session/Flex.pm	4	%%SITE_PERL%%/Apache/Session/Flex.pm
5	%%SITE_PERL%%/Apache/Session/MySQL.pm
6	%%SITE_PERL%%/Apache/Session/Oracle.pm
7	%%SITE_PERL%%/Apache/Session/Postgres.pm
8	%%SITE_PERL%%/Apache/Session/Sybase.pm
9	%%SITE_PERL%%/Apache/Session/Generate/MD5.pm	5	%%SITE_PERL%%/Apache/Session/Generate/MD5.pm
10	%%SITE_PERL%%/Apache/Session/Generate/ModUniqueId.pm	6	%%SITE_PERL%%/Apache/Session/Generate/ModUniqueId.pm
11	%%SITE_PERL%%/Apache/Session/Generate/ModUsertrack.pm	7	%%SITE_PERL%%/Apache/Session/Generate/ModUsertrack.pm
		8	%%SITE_PERL%%/Apache/Session/Informix.pm
12	%%SITE_PERL%%/Apache/Session/Lock/File.pm	9	%%SITE_PERL%%/Apache/Session/Lock/File.pm
13	%%SITE_PERL%%/Apache/Session/Lock/File.pm.orig
14	%%SITE_PERL%%/Apache/Session/Lock/MySQL.pm	10	%%SITE_PERL%%/Apache/Session/Lock/MySQL.pm
15	%%SITE_PERL%%/Apache/Session/Lock/Null.pm	11	%%SITE_PERL%%/Apache/Session/Lock/Null.pm
16	%%SITE_PERL%%/Apache/Session/Lock/Semaphore.pm	12	%%SITE_PERL%%/Apache/Session/Lock/Semaphore.pm
		13	%%SITE_PERL%%/Apache/Session/Lock/Sybase.pm
		14	%%SITE_PERL%%/Apache/Session/MySQL.pm
		15	%%SITE_PERL%%/Apache/Session/Oracle.pm
		16	%%SITE_PERL%%/Apache/Session/Postgres.pm
17	%%SITE_PERL%%/Apache/Session/Serialize/Base64.pm	17	%%SITE_PERL%%/Apache/Session/Serialize/Base64.pm
18	%%SITE_PERL%%/Apache/Session/Serialize/Storable.pm	18	%%SITE_PERL%%/Apache/Session/Serialize/Storable.pm
19	%%SITE_PERL%%/Apache/Session/Serialize/Sybase.pm	19	%%SITE_PERL%%/Apache/Session/Serialize/Sybase.pm
Lines 21-35 Link Here
21	%%SITE_PERL%%/Apache/Session/Store/DBI.pm	21	%%SITE_PERL%%/Apache/Session/Store/DBI.pm
22	%%SITE_PERL%%/Apache/Session/Store/DB_File.pm	22	%%SITE_PERL%%/Apache/Session/Store/DB_File.pm
23	%%SITE_PERL%%/Apache/Session/Store/File.pm	23	%%SITE_PERL%%/Apache/Session/Store/File.pm
24	%%SITE_PERL%%/Apache/Session/Store/File.pm.orig	24	%%SITE_PERL%%/Apache/Session/Store/Informix.pm
25	%%SITE_PERL%%/Apache/Session/Store/MySQL.pm	25	%%SITE_PERL%%/Apache/Session/Store/MySQL.pm
26	%%SITE_PERL%%/Apache/Session/Store/Oracle.pm	26	%%SITE_PERL%%/Apache/Session/Store/Oracle.pm
27	%%SITE_PERL%%/Apache/Session/Store/Postgres.pm	27	%%SITE_PERL%%/Apache/Session/Store/Postgres.pm
28	%%SITE_PERL%%/Apache/Session/Store/Sybase.pm	28	%%SITE_PERL%%/Apache/Session/Store/Sybase.pm
		29	%%SITE_PERL%%/Apache/Session/Sybase.pm
29	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist	30	%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
30	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session	31	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
		32	@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null \|\| true
31	@dirrm %%SITE_PERL%%/Apache/Session/Store	33	@dirrm %%SITE_PERL%%/Apache/Session/Store
32	@dirrm %%SITE_PERL%%/Apache/Session/Serialize	34	@dirrm %%SITE_PERL%%/Apache/Session/Serialize
33	@dirrm %%SITE_PERL%%/Apache/Session/Lock	35	@dirrm %%SITE_PERL%%/Apache/Session/Lock
34	@dirrm %%SITE_PERL%%/Apache/Session/Generate	36	@dirrm %%SITE_PERL%%/Apache/Session/Generate
35	@dirrm %%SITE_PERL%%/Apache/Session	37	@dirrm %%SITE_PERL%%/Apache/Session
		38	@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null \|\| true

Removed Link Here

(-)files/patch-Session::Lock::File.pm (-24 lines)
1	--- Session/Lock/File.pm.orig Sat Sep 2 00:21:17 2000
2	+++ Session/Lock/File.pm Thu Dec 6 17:37:40 2001
3	@@ -36,8 +36,9 @@
4
5	my $LockDirectory = $session->{args}->{LockDirectory} \|\|
6	$Apache::Session::Lock::File::LockDirectory;
7	+ my $LockFile = $LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock";
8
9	- open($fh, "+>".$LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock") \|\| die $!;
10	+ open($fh, "+> $LockFile") \|\| die "$LockFile: $!";
11
12	$self->{fh} = $fh;
13	$self->{opened} = 1;
14	@@ -58,8 +59,9 @@
15
16	my $LockDirectory = $session->{args}->{LockDirectory} \|\|
17	$Apache::Session::Lock::File::LockDirectory;
18	+ my $LockFile = $LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock";
19
20	- open($fh, "+>".$LockDirectory."/Apache-Session-".$session->{data}->{_session_id}.".lock") \|\| die $!;
21	+ open($fh, "+> $LockFile") \|\| die "$LockFile: $!";
22
23	$self->{fh} = $fh;
24	$self->{opened} = 1;

Removed Link Here

(-)files/patch-Session::Store::File.pm (-71 lines)
1	--- Session/Store/File.pm.orig Mon Jul 24 05:44:52 2000
2	+++ Session/Store/File.pm Thu Dec 6 17:49:31 2001
3	@@ -33,13 +33,14 @@
4	my $session = shift;
5
6	my $directory = $session->{args}->{Directory} \|\| $Apache::Session::Store::File::Directory;
7	+ my $file = $directory.'/'.$session->{data}->{_session_id};
8
9	- if (-e $directory.'/'.$session->{data}->{_session_id}) {
10	- die "Object already exists in the data store";
11	+ if (-e $file) {
12	+ die "Object already exists in the data store: $file";
13	}
14
15	- sysopen ($self->{fh}, $directory.'/'.$session->{data}->{_session_id}, O_RDWR\|O_CREAT) \|\|
16	- die "Could not open file: $!";
17	+ sysopen ($self->{fh}, $file, O_RDWR\|O_CREAT) \|\|
18	+ die "Could not open $file: $!";
19
20	$self->{opened} = 1;
21
22	@@ -51,10 +52,11 @@
23	my $session = shift;
24
25	my $directory = $session->{args}->{Directory} \|\| $Apache::Session::Store::File::Directory;
26	+ my $file = $directory.'/'.$session->{data}->{_session_id};
27
28	if (!$self->{opened}) {
29	- sysopen ($self->{fh}, $directory.'/'.$session->{data}->{_session_id}, O_RDWR\|O_CREAT) \|\|
30	- die "Could not open file: $!";
31	+ sysopen ($self->{fh}, $file, O_RDWR\|O_CREAT) \|\|
32	+ die "Could not open $file: $!";
33
34	$self->{opened} = 1;
35	}
36	@@ -69,11 +71,12 @@
37	my $session = shift;
38
39	my $directory = $session->{args}->{Directory} \|\| $Apache::Session::Store::File::Directory;
40	+ my $file = $directory.'/'.$session->{data}->{_session_id};
41
42	- if (-e $directory.'/'.$session->{data}->{_session_id}) {
43	+ if (-e $file) {
44	if (!$self->{opened}) {
45	- sysopen ($self->{fh}, $directory.'/'.$session->{data}->{_session_id}, O_RDWR\|O_CREAT) \|\|
46	- die "Could not open file: $!";
47	+ sysopen ($self->{fh}, $file, O_RDWR\|O_CREAT) \|\|
48	+ die "Could not open $file: $!";
49
50	$self->{opened} = 1;
51	}
52	@@ -96,15 +99,16 @@
53	my $session = shift;
54
55	my $directory = $session->{args}->{Directory} \|\| $Apache::Session::Store::File::Directory;
56	+ my $file = $directory.'/'.$session->{data}->{_session_id};
57
58	if ($self->{opened}) {
59	CORE::close $self->{fh};
60	$self->{opened} = 0;
61	}
62
63	- if (-e $directory.'/'.$session->{data}->{_session_id}) {
64	- unlink ($directory.'/'.$session->{data}->{_session_id}) \|\|
65	- die "Could not remove file: $!";
66	+ if (-e $file) {
67	+ unlink ($file) \|\|
68	+ die "Could not remove $file: $!";
69	}
70	else {
71	die "Object does not exist in the data store";