cvs commit: modperl Changes
dougm 01/07/09 20:30:30
Modified:src/modules/perl mod_perl.c mod_perl.h
.Changes
Log:
allow per-server and per-location PerlSetEnv to be properly merged
when a per-server handler is configured
Revision ChangesPath
1.141 +8 -3 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mod_perl.c2001/06/19 03:12:44 1.140
+++ mod_perl.c2001/07/10 03:30:27 1.141
@@ -1388,6 +1388,14 @@
cfg-setup_env = 0; /* just once per-request */
}
+if (cfg-dir_env != cld-env) {
+/* PerlSetEnv
+ * update only if the table changes across a request
+ */
+mod_perl_dir_env(r, cld);
+cfg-dir_env = cld-env;
+}
+
if(callbacks_this_request++ 0) return;
if (!r-main) {
@@ -1397,9 +1405,6 @@
*/
(void)perl_request_rec(r);
}
-
-/* PerlSetEnv */
-mod_perl_dir_env(r, cld);
/* SetEnv PERL5LIB */
if (!MP_INCPUSH(cld)) {
1.110 +1 -0 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_perl.h2001/06/19 03:12:45 1.109
+++ mod_perl.h2001/07/10 03:30:28 1.110
@@ -1064,6 +1064,7 @@
typedef struct {
HV *pnotes;
int setup_env;
+table *dir_env;
array_header *sigsave;
} perl_request_config;
1.611 +4 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -r1.610 -r1.611
--- Changes 2001/07/09 15:03:07 1.610
+++ Changes 2001/07/10 03:30:29 1.611
@@ -10,6 +10,10 @@
=item 1.25_02-dev
+allow per-server and per-location PerlSetEnv to be properly merged
+when a per-server handler is configured, thanks to Michael Barry for
+the spot
+
enabled Apache::ModuleConfig on win32
[Randy Kobes [EMAIL PROTECTED]]
RE: cvs commit: modperl-2.0/Apache-Test/lib/Apache TestConfigPerl.pm
On Mon, 9 Jul 2001, Geoffrey Young wrote:
die in modperl_startup.pl if modperl_{inc,extra}.pl die
anyway, I thought modperl_extra.pl was supposed to be optional?
it is still optional, but if it exists and dies, then mod_perl should
propagate that. although, the $@ !~ /^Can.t locate/ is bogus, because it
might be that modperl_extra.pl was located, but a module it requires was
not.
cvs commit: modperl-2.0/Apache-Test/lib/Apache TestConfigPerl.pm
dougm 01/07/09 09:04:48
Modified:Apache-Test/lib/Apache TestConfigPerl.pm
Log:
better check for existance of modperl_{inc,extra}.pl
Revision ChangesPath
1.14 +1 -1 modperl-2.0/Apache-Test/lib/Apache/TestConfigPerl.pm
Index: TestConfigPerl.pm
===
RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestConfigPerl.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestConfigPerl.pm 2001/06/26 17:09:46 1.13
+++ TestConfigPerl.pm 2001/07/09 16:04:44 1.14
@@ -83,7 +83,7 @@
use lib '$serverroot';
for my \$file (qw(modperl_inc.pl modperl_extra.pl)) {
eval { require conf/\$file } or
-die if \$@ !~ /^Can.t locate/;
+die if grep { -e \$_/conf/\$file } \@INC;
}
}
cvs commit: modperl-site/embperl index.html
richter 01/07/09 06:01:43 Modified:embperl index.html Log: Embperl website Revision ChangesPath 1.127 +13 -6 modperl-site/embperl/index.html Index: index.html === RCS file: /home/cvs/modperl-site/embperl/index.html,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- index.html2001/07/09 05:59:25 1.126 +++ index.html2001/07/09 13:01:41 1.127 @@ -71,7 +71,7 @@ tr td bgcolor=#AFBDCAnbsp;Current Versionbr nbsp;a href=Embperl.pod.16.htmlcodeStable: 1.3.3/code/abr - nbsp;a href=Embperl.pod.16.htmlcodeBeta: nbsp;nbsp;2.0b2/code/abr + nbsp;a href=Embperl.pod.16.htmlcodeBeta: nbsp;nbsp;2.0b3/code/abr /tr tr td bgcolor=#00 align=centerbiga href=http://www.ecos.de/embperl/;img src=de.gif border=0/a/big/td @@ -131,12 +131,19 @@ tr td bgcolor=#bFcDdAbr ul type=square -lib29. Juni 2001/bbr - Embperl on conference tour: There is a talk on the +lib9. July 2001/bbr + Embperl 2.0b3 released. Includes many bugfixes which have greatly improved the usablility. + a href=ftp://ftp.dev.ecos.de/pub/perl/embperl/HTML-Embperl-2.0b3.tar.gz; + You can download it here/a +lib9. July 2001/bbr + bEmbperl on conference tour:/b There is a talk about Embperl on the a href=http://conferences.oreillynet.com/cs/os2001/pub/w/os2001/sessions_modperl.html;O'Reilly Open Source Software Convention/a - at July, 26. - If you prefer to come to europe you can visit the a href=http://apachecon.com/2001/EU/html/sessions.html;ApacheCon/A - on Oct, 15. in Dublin. Also I will be in Amsterdam at the YAPC and talk about mod_perl 2.0 + at bJuly, 26/b. + If you prefer to come to europe you can visit the + a href=http://apachecon.com/2001/EU/html/sessions.html;ApacheCon/A + on BOct, 15/b. in Dublin and hear me talking about Embperl. Also I will be in Amsterdam at the + a href=http://www.yapc.org/Europe/talks.html#33;YAPC and talk about mod_perl 2.0/a + on bAug, 3/b. lib6. Juni 2001/bbr Embperl 1.3.3 released. lib16. May 2001/bbr @@ -213,7 +220,7 @@ blockquote pfont color=#808080 size=1hr HTML::Embperl - Copyright (c) 1997-2001 Gerald Richter / ECOS lt;[EMAIL PROTECTED]gt; - Last Update $Id: index.html,v 1.126 2001/07/09 05:59:25 richter Exp $/font/p + Last Update $Id: index.html,v 1.127 2001/07/09 13:01:41 richter Exp $/font/p /blockquote /td/tr!--msnavigation--/table/body /html
cvs commit: modperl/apaci mod_perl.exp
dougm 01/07/09 08:03:29
Modified:.INSTALL.win32 Makefile.PL Changes
lib/Apache src.pm
src/modules/win32 mod_perl.def mod_perl.dsp
t/conf httpd.conf-win32
t/modules src.t
apacimod_perl.exp
Log:
enabled Apache::ModuleConfig on win32
win32 support for Apache::src
Revision ChangesPath
1.8 +4 -0 modperl/INSTALL.win32
Index: INSTALL.win32
===
RCS file: /home/cvs/modperl/INSTALL.win32,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- INSTALL.win32 2001/06/21 16:11:42 1.7
+++ INSTALL.win32 2001/07/09 15:03:05 1.8
@@ -151,6 +151,10 @@
will complete the installation.
+This latter method of building mod_perl will also install the
+Apache and mod_perl header files, which can then be accessed
+through the Apache::src module.
+
=head1 CONFIGURATION
Add this line to httpd.conf:
1.191 +45 -6 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- Makefile.PL 2001/07/06 20:08:27 1.190
+++ Makefile.PL 2001/07/09 15:03:06 1.191
@@ -354,7 +354,14 @@
$callback_hooks{$k} = $v if exists $callback_hooks{$k};
}
-my $win32_auto = ($vcpp and $win32_args{APACHE_SRC}) ? 1 : 0;
+my $win32_auto;
+if ($vcpp and $win32_args{APACHE_SRC}) {
+ $EVERYTHING = 1;
+ my $fixed_apsrc = win32_fix_path($win32_args{APACHE_SRC});
+ $APACHE_SRC = -d $fixed_apsrc/include ?
+$fixed_apsrc : $fixed_apsrc . '/src';
+ $win32_auto = 1;
+}
my %very_experimental = map {$_,1}
qw(PERL_DEFAULT_OPMASK PERL_SAFE_STARTUP PERL_ORALL_OPMASK
@@ -774,7 +781,9 @@
(need 1.2.0 or higher);
}
-for (qw(PERL_SECTIONS PERL_SSI), keys %experimental) {
+$PERL_SECTIONS = $PERL_SSI = 0 if $Is_Win32;
+unless ($Is_Win32) {
+ for (qw(PERL_SECTIONS PERL_SSI), keys %experimental) {
$k = $_;
if($experimental{$_}) {
@@ -797,6 +806,7 @@
iedit $APACHE_SRC/modules/perl/Makefile, s/^($_) /#\$1 /
if $$_;
}
+ }
}
unless ($USE_APACI or $USE_APXS) {
iedit $APACHE_SRC/modules/perl/Makefile, s/^#TRACE/TRACE/ if $PERL_TRACE;
@@ -877,7 +887,7 @@
iedit $APACHE_SRC/modules/perl/Makefile, s/^#__ORIGINAL__/$edit_note/;
}
-if($mmn = 19970912 and not $USE_APACI and not $USE_APXS) { #1.3b1
+if($mmn = 19970912 and not $USE_APACI and not $USE_APXS and not $Is_Win32) {
#1.3b1
system cat $APACHE_SRC/Makefile.config $APACHE_SRC/modules/perl/Makefile
/tmp/mpmf.$$;
system mv /tmp/mpmf.$$ $APACHE_SRC/modules/perl/Makefile;
}
@@ -887,7 +897,7 @@
\t, '$(CP) t/conf/mod_perl_srm.conf t/conf/srm.conf', \n;
}
unless ($USE_APXS) {
- unless (-l t/httpd) {
+ unless (-l t/httpd or $Is_Win32) {
system $Config{lns} $APACHE_SRC/httpd t/httpd;
}
write_extra_tests();
@@ -1088,6 +1098,10 @@
my $dummy = hooks=`$hooks'\n unless $hooks;
cp lib/mod_perl_hooks.pm.PL, lib/mod_perl_hooks.pm;
+if ($Is_Win32) {
+ my @args = ($^X, ' -spi.bak ', ' -e ', \s/sub mod_perl::hooks.*/sub
mod_perl::hooks { qw($hooks) }/\, 'lib/mod_perl_hooks.pm');
+ system(@args) == 0 or die @args failed\n;
+}
iedit lib/mod_perl_hooks.pm,
qq(s/sub mod_perl::hooks.*/sub mod_perl::hooks { qw($hooks) }/);
@@ -1099,7 +1113,7 @@
@list == @mod_perl_hooks or die Edit of lib/mod_perl_hooks.pm failed $!\n;
}
-unlink lib/mod_perl_hooks.pm~;
+unlink $Is_Win32 ? lib/mod_perl_hooks.pm.bak : lib/mod_perl_hooks.pm~;
}
#checking for LWP code, borrowed from LWP's own Makefile.PL :-)
@@ -1183,7 +1197,15 @@
}
mkdir t/docs/subr, 0755;
-system date t/docs/subr/index.html;
+if ($Is_Win32) {
+ open FH, t/docs/subr/index.html
+ or die Cannot open t/docs/subr/index.html: $!;
+ print FH scalar(localtime);
+ close FH;
+}
+else {
+ system date t/docs/subr/index.html;
+}
return unless
$callback_hooks{PERL_STACKED_HANDLERS}
@@ -1524,6 +1546,18 @@
$My::self-{PM}-{$from} = $to;
}
+sub win32_mph {
+return unless /\.h$/ or /os-inline\.c$/;
+(my $d = $File::Find::dir) =~ s:^\Q$MODPERL_SRC::;
+$d =~ s:^/::;
+my $from = $File::Find::dir/$_;
+my $to = '$(INST_ARCHLIB)/' . auto/Apache/include/modules/perl/;
+$to .= $d/ if $d;
+$to .= $_;
+
+$My::self-{PM}-{$from} = $to;
+}
+
sub
