richter 01/09/19 06:55:41
Modified: Embperl Tag: Embperl2c Session.pm
Log:
Revision Changes Path
No revision
No revision
1.4.4.6 +0 -21 embperl/Embperl/Session.pm
Index: Session.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Session.pm,v
retrieving revision 1.4.4.5
retrieving revision 1.4.4.6
diff -u -r1.4.4.5 -r1.4.4.6
--- Session.pm 2001/09/19 07:36:15 1.4.4.5
+++ Session.pm 2001/09/19 13:55:41 1.4.4.6
@@ -239,19 +239,11 @@
my $session_id = $self->{data}->{_session_id} ;
-<<<<<<< Session.pm
if (!$session_id && $self -> {idfrom})
{
$session_id = $self->{data}->{_session_id} = &{$self->{generate}}($self,
$self -> {idfrom}) ;
}
-=======
- if (!$session_id && $self -> {idfrom})
- {
- $session_id = $self->{data}->{_session_id} = &{$self->{generate}}($self,
$self -> {idfrom}) ;
- }
-
->>>>>>> 1.4.4.4
$self->{initial_session_id} ||= $session_id ;
$self->populate;
@@ -421,7 +413,6 @@
$self->{'status'} = 0 ;
$self->{data}->{_session_id} = $self->{initial_session_id} = shift ;
-<<<<<<< Session.pm
}
sub setidfrom {
@@ -433,19 +424,7 @@
}
-=======
-}
-
-sub setidfrom {
- my $self = shift;
-
- $self->{'status'} = 0 ;
- $self->{data}->{_session_id} = $self->{initial_session_id} = undef ;
- $self->{idfrom} = shift ;
-
-}
->>>>>>> 1.4.4.4
sub getid {
my $self = shift;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
