richter 00/11/13 10:38:56
Modified: . Tag: Embperl2c Changes.pod Makefile.PL epnames.h
Embperl Tag: Embperl2c Session.pm
test/conf Tag: Embperl2c httpd.conf.src
Log:
Embperl 2 - sync with 1.3
Revision Changes Path
No revision
No revision
1.129.4.4 +36 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.3
retrieving revision 1.129.4.4
diff -u -r1.129.4.3 -r1.129.4.4
--- Changes.pod 2000/10/31 08:02:46 1.129.4.3
+++ Changes.pod 2000/11/13 18:38:42 1.129.4.4
@@ -42,6 +42,42 @@
- Execute ('file.htm#subname') works now without a previous
import
+
+=head1 1.3b7_dev
+
+ - Fixed problem that call to close triggers error in Session.pm when using
Store::File.
+ Spotted by Alvar Freude.
+ - Fixed problem that GetSession doesn't return a value for new session.
+ Spotted by Angus Lees.
+ - Added new function SetSessionCookie, which can be used to set the session
cookie
+ header in case you use Embperl session management, but don't use a
+ Embperl page in that request. Suggested by Alex Schmelkin.
+ - Fixed problem that DeleteSession does not work outside the base template, when
+ used with EmbperlObject. Spotted by Angus Lees.
+ - Fixed problem when use multiple nested ../foo.htm inside EmbperlObject.
+ Spotted by Neil Gunton.
+ - Included patch from Angus Lees to ease building on debian.
+ - make test now works again with BEN-SSL httpsd. With help from Neil Gunton.
+ - Included grammaticaly updated Embperl.pod. Many thanks to Ilia Lobsanov
+ for doing the proof reading.
+ - removed dbgDisableCache to avoid problems with this "feature" that isn't
working
+ anymore for a long time.
+ - Added validaten for session cookie. If Apache::Session 1.53+ is installed
+ it uses the validate method from Apache::Session::Generate::xxx. If a invalid
+ session id is found a new one is generated. Spotted by Angus Lees.
+ - If a not existing session id is received, Embperl generates now a new one.
+ - Enhancements of Cookie resending logic. To make sure cookies are send when
+ neccessary, but not more often. (Handles now write to session data, after
+ a delete in the same request correctly).
+ - Added more tests for Sessionhandling.
+ - Fixed a bug that Content-Lenght was 2 to much, when escmode was set to zero.
+ Spotted by Michael Smith.
+ - Added patches from Randy Korbes for ActiveState Support. Most tests with
+ Embperl under mod_perl nows passes. The few remaining ones that doesn't pass
+ seems to be due to problems of mod_perl's enironment handling.
+ - Droped support for Apache::Session 0.17. Embperl now support only
+ Apache::Session 1.00 and higher.
+
=head1 1.3b6 (BETA) 18. Oct 2000
- Embperl now runs on ActiveState Perl. (At least in offline mode,
1.31.4.5 +32 -44 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.4
retrieving revision 1.31.4.5
diff -u -r1.31.4.4 -r1.31.4.5
--- Makefile.PL 2000/11/10 08:52:26 1.31.4.4
+++ Makefile.PL 2000/11/13 18:38:43 1.31.4.5
@@ -247,6 +247,19 @@
## ----------------------------------------------------------------------------
+sub cnvpath2unix
+
+ {
+ my $path = shift ;
+
+ $path =~ s#\\#/#g if ($win32) ;
+
+ return $path ;
+ }
+
+## ----------------------------------------------------------------------------
+
+
sub start
{
@@ -528,41 +541,6 @@
{
$mpdll = $1 ;
}
-=pod
- else
- {
- SEARCH:
- {
- for my $drive ('c'..'g')
- {
- for my $p ("program files\\apache\\modules", "apache\\modules")
- {
- last SEARCH if -e ($mpdll = "$drive:\\$p\\apachemoduleperl.dll");
- }
- }
- }
- }
-
- $mpdll .= "\\apachemoduleperl.dll" if (!($mpdll =~ /apachemoduleperl\.dll/i)) ;
- if (!(-f $mpdll))
- {
- require ExtUtils::MakeMaker;
- ExtUtils::MakeMaker->import('prompt');
- $mpdll = prompt("Where is your ApacheModulePerl.dll located ?", $mpdll);
- $mpdll .= "\\apachemoduleperl.dll" if (!($mpdll =~
/apachemoduleperl\.dll/i)) ;
- if (!(-f $mpdll))
- {
- print "$mpdll not found, please make sure Apache and mod_perl are
installed before installing Embperl\n" ;
- exit (1) ;
- }
- }
-
- $mpdll = cnvpath ($mpdll) ;
- $mpdll =~ s/\\\\/\\/g ;
-
- die "Can't find ApacheModulePerl.dll at $mpdll!" if (!(-e $mpdll));
-=cut
-
}
#
@@ -631,7 +609,8 @@
@EPAPACHEVERSION = start ("$EPHTTPD -v") ;
@modules = start ("$EPHTTPD -l") ;
- print "Apache Version $EPAPACHEVERSION[0]" ;
+ chomp ($EPAPACHEVERSION[0]) ;
+ print "Apache Version $EPAPACHEVERSION[0]\n" ;
$EPSTRONGHOLD = ($EPAPACHEVERSION[0] =~ /stronghold/i) ;
$EPAPACHE_SSL = grep (/apache_ssl.c/, @modules) ;
@@ -690,13 +669,9 @@
$use_dso = 0 ;
- #if (!$win32 && -e "$apache_src/modules/perl/libperl.so" && !grep
(/mod_perl.c/, @modules))
if (!$win32 && ($EPMODPERL =~ /perl_module/))
{
- #$EPMODPERL="LoadModule perl_module $apache_src/modules/perl/libperl.so" ;
- #$EPSTARTUP ='startup_dso.pl' ;
print " + mod_perl was build with USE_DSO\n" ;
- #aixold# $dynlib->{'OTHERLDFLAGS'} = "-bI:mod_perl.exp
-bI:$apache_src/support/httpd.exp" if ($aix);
$use_dso = 1 ;
}
@@ -787,10 +762,17 @@
{
if ($SessVer && !($SessVer =~ /0\.17/))
{
- print "-> Embperl works only with Apache::Session 0.17.x or 1.00 and
higher\n" ;
+ print "-> Embperl works only with Apache::Session 1.00 and higher\n" ;
print "-> Disable tests for persistent data storage\n" ;
$SessVer = '0' ;
}
+ else
+ {
+ print "-> Embperl does not support Apache::Session 0.17.x anymore.\n" ;
+ print "-> Please upgrade to 1.50 or higher.\n" ;
+ print "-> Disable tests for persistent data storage.\n" ;
+ $SessVer = '0' ;
+ }
}
$SessVer ||= 0 ;
@@ -813,11 +795,12 @@
print FH "\$EPSTRONGHOLD='$EPSTRONGHOLD' ;\n" ;
print FH "\$EPSSLDISABLE='$EPSSLDISABLE' ;\n" ;
print FH "\$EPSTRONGHOLDKEY='$EPSTRONGHOLDKEY' ;\n" ;
- print FH "\$EPMODPERL='" . cnvpath($EPMODPERL) . "';\n" ;
+ print FH "\$EPMODPERL='" . cnvpath2unix($EPMODPERL) . "';\n" ;
print FH "\$EPSTARTUP='" . cnvpath($EPSTARTUP) . "';\n" ;
print FH "\$EPAPACHEVERSION='$EPAPACHEVERSION[0]';\n" ;
print FH "\$EPSESSIONVERSION='$SessVer';\n" ;
print FH "\$EP2='$EP2';\n" ;
+ print FH "\$EPMODPERLVERSION='$MPVer';\n" ;
if ($win32)
{
print FH "\$EPNULL='nul';\n" ;
@@ -862,8 +845,14 @@
# $d .= ' -DPERL_IS_5_6 ' if $] >= 5.006;
if ($win32)
- { # Check for winsock2api
+ {
+ # check for inclusion of malloc.h and signal.h
+ if ($Config{usemultiplicity})
+ {
+ $d .= ' -D_INC_MALLOC -D_INC_SIGNAL ';
+ }
+ # Check for winsock2api
if (open FH, "$inc_dir/../os/win32/os.h")
{
my @conf = <FH> ;
@@ -900,7 +889,6 @@
'VERSION_FROM' => 'Embperl.pm', # finds $VERSION
'OBJECT' => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT)
epchar$(OBJ_EXT) epcmd$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) epdbg$(OBJ_EXT) ' .
($EP2?'epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT)
epcomp$(OBJ_EXT)':'') . $o,
-# 'XS' => { 'Embperl.xs' => 'Embperl.c', ($EP2?('Cmd.xs' => 'Cmd.c',
'DOM.xs' => 'DOM.c'):())},
'LIBS' => [''],
'DEFINE' => "$d \$(DEFS)",
'INC' => $i,
1.19.4.2 +2 -0 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -u -r1.19.4.1 -r1.19.4.2
--- epnames.h 2000/10/17 12:55:44 1.19.4.1
+++ epnames.h 2000/11/13 18:38:43 1.19.4.2
@@ -69,6 +69,8 @@
#define EvalTransFlags EMBPERL_EvalTransFlags
#define EvalTransOnFirstCall EMBPERL_EvalTransOnFirstCall
#define EvalSub EMBPERL_EvalSub
+#define EvalOnly EMBPERL_EvalOnly
+#define CallCV EMBPERL_CallCV
#define GetContentLength EMBPERL_GetContentLength
#define GetLogFilePos EMBPERL_GetLogFilePos
#define ReadHTML EMBPERL_ReadHTML
No revision
No revision
1.4.4.3 +1 -1 embperl/Embperl/Session.pm
Index: Session.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Session.pm,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- Session.pm 2000/11/10 08:52:34 1.4.4.2
+++ Session.pm 2000/11/13 18:38:50 1.4.4.3
@@ -285,7 +285,7 @@
}
else
{
- $self->{data}->{_session_id} = $self -> generate_id() if
(!$self->{data}->{_session_id}) ;
+ $self->{data}->{_session_id} = $self -> generate_id() ;
}
}
$self->save;
No revision
No revision
1.24.4.3 +6 -0 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.2
retrieving revision 1.24.4.3
diff -u -r1.24.4.2 -r1.24.4.3
--- httpd.conf.src 2000/11/08 21:41:32 1.24.4.2
+++ httpd.conf.src 2000/11/13 18:38:51 1.24.4.3
@@ -25,6 +25,8 @@
EOD
}
+
+
print OFH <<EOD ;
$EPMODPERL
@@ -45,6 +47,10 @@
PerlSetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
SetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
EOD
+
+print OFH "SetEnv EMBPERL_OPTIONS 0\n" if ($EPMODPERLVERSION >= 1.24) ;
+
+
if ($EPSESSIONVERSION)
{
print OFH <<EOD ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
