richter 00/09/12 23:06:53
Modified: . Changes Makefile.PL
src/modules/ApacheModulePerl ApacheModulePerl.dsp
t/docs startup.pl
t/net/perl dirty-script.cgi dirty-test.cgi
Added: src/modules/ApacheModulePerl ApacheModulePerl.def
Log:
Latest patches so mod_perl works now on ActivePerl
Revision Changes Path
1.515 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- Changes 2000/09/01 21:09:12 1.514
+++ Changes 2000/09/13 06:06:39 1.515
@@ -15,6 +15,8 @@
fixes for ActivePerl [Gurusamy Sarathy <[EMAIL PROTECTED]>]
+runs now on ActivePerl [Randy Korbes, Gerald Richter]
+
change apaci/Makefile.tmpl and src/modules/perl/Makefile so Perl's
include path comes before /usr/local/include, e.g. to make sure Perl's
patchlevel.h is used, thanks to Ryan Morgan for the spot
1.166 +5 -0 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- Makefile.PL 2000/09/01 21:09:12 1.165
+++ Makefile.PL 2000/09/13 06:06:40 1.166
@@ -1170,6 +1170,11 @@
#DIR => \@DIR,
NAME => "mod_perl",
VERSION => $VERSION,
+ ($] < 5.005 ? () :
+ (
+ ABSTRACT => 'Embed a Perl interpreter in the Apache HTTP server',
+ AUTHOR => 'Doug MacEachern <[EMAIL PROTECTED]>',
+ )),
#should override `CCFLAGS', can't with older perls
#CCDLFLAGS => "$Config{ccdlflags} $EXTRA_CFLAGS",
DEFINE => $EXTRA_CFLAGS,
1.7 +4 -0 modperl/src/modules/ApacheModulePerl/ApacheModulePerl.dsp
Index: ApacheModulePerl.dsp
===================================================================
RCS file: /home/cvs/modperl/src/modules/ApacheModulePerl/ApacheModulePerl.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModulePerl.dsp 2000/03/05 01:26:57 1.6
+++ ApacheModulePerl.dsp 2000/09/13 06:06:43 1.7
@@ -92,6 +92,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ApacheModulePerl.def
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\..\Apache\ApacheCore.lib
# End Source File
# Begin Source File
1.1 modperl/src/modules/ApacheModulePerl/ApacheModulePerl.def
Index: ApacheModulePerl.def
===================================================================
LIBRARY
EXPORTS
sv2request_rec
perl_request_rec
mod_perl_tie_table
perl_cmd_perl_FLAG
perl_cmd_perl_TAKE2
perl_cmd_perl_TAKE1
perl_cmd_perl_TAKE123
perl_perl_cmd_cleanup
1.38 +3 -1 modperl/t/docs/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/modperl/t/docs/startup.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- startup.pl 2000/05/12 07:10:58 1.37
+++ startup.pl 2000/09/13 06:06:46 1.38
@@ -11,7 +11,9 @@
use lib map { "$Apache::Server::CWD/$_" } qw(t/docs blib/lib blib/arch);
require "blib.pl" if -e "./t/docs/blib.pl";
#Perl ignores w/ -T
- unshift @INC, split ":", $ENV{PERL5LIB} if $ENV{PERL5LIB};
+ if ($ENV{PERL5LIB} and $ENV{PASS_PERL5LIB}) {
+ unshift @INC, map { Apache->untaint($_) } split ":", $ENV{PERL5LIB};
+ }
$Apache::Server::Starting or warn "Server is not starting !?\n";
\$Apache::Server::Starting == \$Apache::ServerStarting or
1.6 +5 -1 modperl/t/net/perl/dirty-script.cgi
Index: dirty-script.cgi
===================================================================
RCS file: /home/cvs/modperl/t/net/perl/dirty-script.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirty-script.cgi 2000/05/12 07:10:59 1.5
+++ dirty-script.cgi 2000/09/13 06:06:48 1.6
@@ -1,6 +1,10 @@
local $^W = 0;
-use lib '.';
+unshift @INC,
+ -e "dirty-lib" ? '.' :
+ Apache->server_root_relative("net/perl");
require "dirty-lib";
+shift @INC;
+
unless (defined(¬_ina_package) && not_ina_package()) {
die "%INC save/restore broken";
}
1.6 +6 -1 modperl/t/net/perl/dirty-test.cgi
Index: dirty-test.cgi
===================================================================
RCS file: /home/cvs/modperl/t/net/perl/dirty-test.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dirty-test.cgi 2000/05/12 07:10:59 1.5
+++ dirty-test.cgi 2000/09/13 06:06:48 1.6
@@ -1,5 +1,10 @@
-use lib '.';
+
+unshift @INC,
+ -e "dirty-lib" ? '.' :
+ Apache->server_root_relative("net/perl");
require "dirty-lib";
+shift @INC;
+
unless (defined(¬_ina_package) && not_ina_package()) {
die "%INC save/restore broken";
}
