richter 00/11/12 21:43:55
Modified: . Changes.pod Embperl.pm Makefile.PL
test/conf httpd.conf.src
Log:
- 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.
Revision Changes Path
1.141 +6 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- Changes.pod 2000/11/11 13:28:29 1.140
+++ Changes.pod 2000/11/13 05:43:54 1.141
@@ -33,6 +33,12 @@
- 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
1.131 +8 -7 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- Embperl.pm 2000/11/11 13:28:29 1.130
+++ Embperl.pm 2000/11/13 05:43:54 1.131
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.130 2000/11/11 13:28:29 richter Exp $
+# $Id: Embperl.pm,v 1.131 2000/11/13 05:43:54 richter Exp $
#
###################################################################################
@@ -416,12 +416,13 @@
if ($Apache::Session::VERSION =~ /^0\.17/)
{
# Apache::Session = 0.17
- $SessionMgnt = 1 ;
- tie %udat, 'Apache::Session', $ENV{EMBPERL_SESSION_CLASS} || 'Win32',
- undef, {not_lazy=>0, autocommit=>0,
lifetime=>&Apache::Session::LIFETIME} ;
- tie %mdat, 'Apache::Session', $ENV{EMBPERL_SESSION_CLASS} || 'Win32',
- undef, {not_lazy=>0, autocommit=>0,
lifetime=>&Apache::Session::LIFETIME} ;
- warn "[$$]SES: Embperl Session management enabled (0.17)\n" ;
+ ##$SessionMgnt = 1 ;
+ ##tie %udat, 'Apache::Session', $ENV{EMBPERL_SESSION_CLASS} || 'Win32',
+ ## undef, {not_lazy=>0, autocommit=>0,
lifetime=>&Apache::Session::LIFETIME} ;
+ ##tie %mdat, 'Apache::Session', $ENV{EMBPERL_SESSION_CLASS} || 'Win32',
+ ## undef, {not_lazy=>0, autocommit=>0,
lifetime=>&Apache::Session::LIFETIME} ;
+ warn "[$$]SES: Apache::Session 0.17 not supported by Embperl Session
management anymore\n" ;
+ $SessionMgnt = 0 ;
}
}
1.37 +29 -43 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.PL 2000/11/10 08:36:37 1.36
+++ Makefile.PL 2000/11/13 05:43:54 1.37
@@ -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
-
}
#
@@ -690,13 +668,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 +761,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,7 +794,7 @@
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" ;
@@ -862,8 +843,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 +887,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.27 +1 -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- httpd.conf.src 2000/11/07 19:05:08 1.26
+++ httpd.conf.src 2000/11/13 05:43:54 1.27
@@ -41,6 +41,7 @@
SetEnv EMBPERL_DEBUG $EPDEBUG
+SetEnv EMBPERL_OPTIONS 0
SetEnv EMBPERL_VIRTLOG /embperl/log
PerlSetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
SetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
