richter at apache
Jul 2, 2003, 12:39 AM
Post #1 of 1
(610 views)
Permalink
|
|
cvs commit: embperl/Embperl Object.pm
|
|
richter 2003/07/02 00:39:08
Modified: . Changes.pod Makefile.PL
Embperl Object.pm
Log:
fix $req_rec
Revision Changes Path
1.214 +3 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- Changes.pod 12 Jun 2003 20:34:21 -0000 1.213
+++ Changes.pod 2 Jul 2003 07:39:07 -0000 1.214
@@ -6,7 +6,9 @@
- fixed various compiler warnings reported by Angus Lees.
- Added missing Form/Validate modules to distribution.
-
+ - fixed missing $req_rec in base template call from Embperl::Object.
+ Reported by Neil Gunton.
+ - Fixed include path for non standart apr directories.
=head1 2.0b9 10. Juni 2003
1.65 +13 -3 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Makefile.PL 11 Apr 2003 05:41:16 -0000 1.64
+++ Makefile.PL 2 Jul 2003 07:39:07 -0000 1.65
@@ -68,7 +68,9 @@
win32filetext => 'ApacheModuleCgi.dll or mod_cgi.so',
},
- 'mod_actions.c' => { name => 'action_module',
+ 'mod_actions.c' => {
+ name => 'action_module',
+ name2 => 'actions_module',
path => ['$apache_src/modules/standard/mod_actions.so', '$EPBINDIR/modules/mod_actions.so', '$apache_src/mod_actions.so'],
win32path => ['$apache_src/modules/standard/apachemoduleactions.dll', '$EPBINDIR/modules/apachemoduleactions.dll', '$EPBINDIR/modules/mod_actions.so'],
file => ['mod_actions.so','apachemoduleactions.dll'],
@@ -567,6 +569,7 @@
}
}
+
eval 'do "test/conf/config.pl"' ;
@@ -862,7 +865,7 @@
#print "path = $_ -> $path\n" ;
if (-f $path)
{ ## module fould
- $EPMODPERL .= "\r\nLoadModule $opt->{name} \"$path\"" ;
+ $EPMODPERL .= "\r\nLoadModule ". ($mp2cfg?($opt->{name2} || $opt->{name}):$opt->{name}) . " \"$path\"" ;
print " + Load dynamic module $mod\n ($path)\n" ;
$found = 1 ;
last searchmod ;
@@ -1217,6 +1220,13 @@
close FH ;
$i .= " -I$EPPATH/xs" ;
+
+if ($mp2cfg && $mp2cfg->{'MP_INCLUDE_DIR'})
+ {
+ my @inc = split (/\s+/, $mp2cfg->{'MP_INCLUDE_DIR'}) ;
+ $i .= ' -I' . join (' -I', @inc) if (@inc) ;
+ }
+
%MMARGS = (
'LIBS' => [$libs || ''],
1.3 +2 -1 embperl/Embperl/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Object.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Object.pm 22 Oct 2002 05:39:48 -0000 1.2
+++ Object.pm 2 Jul 2003 07:39:08 -0000 1.3
@@ -127,6 +127,7 @@
{
my $req = shift ;
+ $Embperl::req_rec = $req -> {req_rec} ;
my ($rc, $r) = Embperl::Req::InitRequest ($req -> {req_rec}, $req) ;
my $debug = $r && ($r -> config -> debug & Embperl::Constant::dbgObjectSearch) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
