You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2005/06/17 23:14:28 UTC
cvs commit: embperl/test/html/registry Execute.htm
richter 2005/06/17 14:14:28
Modified: . Embperl.pm test.pl
podsrc Config.spod
test/html/registry Execute.htm
Log:
fix problem with Apache 1 initialisation
Revision Changes Path
1.200 +6 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- Embperl.pm 6 May 2005 07:15:36 -0000 1.199
+++ Embperl.pm 17 Jun 2005 21:14:28 -0000 1.200
@@ -95,6 +95,11 @@
$srv_rec = Apache -> server ;
}
}
+elsif ($modperl)
+ {
+ require Apache ;
+ $srv_rec = Apache -> server ;
+ }
if (!defined(&Embperl::Init))
{
1.157 +4 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- test.pl 14 Mar 2005 13:41:45 -0000 1.156
+++ test.pl 17 Jun 2005 21:14:28 -0000 1.157
@@ -1148,6 +1148,9 @@
$SIG{__DIE__} = sub {
return unless $_[0] =~ /^\*\*\*/ ;
return if ($opt_nokill) ;
+
+ print $_[0] ;
+
if ($EPWIN32)
{
$HttpdObj->Kill(-1) if ($HttpdObj) ;
1.18 +1 -1 embperl/podsrc/Config.spod
Index: Config.spod
===================================================================
RCS file: /home/cvs/embperl/podsrc/Config.spod,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Config.spod 12 Mar 2005 13:46:07 -0000 1.17
+++ Config.spod 17 Jun 2005 21:14:28 -0000 1.18
@@ -1541,7 +1541,7 @@
=head2 *METHOD $request / / apache_req / 2.0b6 / no
Returns a reference to mod_perls Apache request object. In mod_perl 1 this is of
-type C<Apache::> in mod_perl 2 it's a C<Apache::RequestRec>.
+type C<Apache::> in mod_perl 2 it's a C<Apache2::RequestRec>.
=head2 *METHOD $request / / config / 2.0b6 / no
1.9 +11 -3 embperl/test/html/registry/Execute.htm
Index: Execute.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/registry/Execute.htm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Execute.htm 25 Feb 2005 08:06:22 -0000 1.8
+++ Execute.htm 17 Jun 2005 21:14:28 -0000 1.9
@@ -12,9 +12,17 @@
# workaround for broken $r -> chdir_file in Apache::Registry on ActiveState perl
use Cwd ;
use File::Basename ;
-eval { require Apache::compat } ;
-$@ = '' ;
-
+if ($Embperl::modperlapi < 2)
+ {
+ eval { require Apache::compat } ;
+ $@ = '' ;
+ }
+else
+ {
+ eval { require Apache2::compat } ;
+ $@ = '' ;
+ }
+
my $fn = $r -> filename ;
chdir(dirname ($fn)) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org