cvs commit: modperl Changes Makefile.PL
dougm 02/05/22 19:52:15
Modified:.Changes Makefile.PL
Log:
autoset PERL_USELARGEFILES=0 if needed
Revision ChangesPath
1.642 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- Changes 16 Apr 2002 02:43:55 - 1.641
+++ Changes 23 May 2002 02:52:15 - 1.642
-10,6 +10,8
=item 1.26_01-dev
+autoset PERL_USELARGEFILES=0 if needed
+
fix taint issues with bleedperl
fix bug in modules/util test
1.201 +10 -7 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- Makefile.PL 23 May 2002 02:44:40 - 1.200
+++ Makefile.PL 23 May 2002 02:52:15 - 1.201
-382,13 +382,6
$PERL_EXTRA_CFLAGS .= -DPERL_SAFE_STARTUP=1;
}
-if ($PERL_USELARGEFILES and $] = 5.006) {
-$PERL_EXTRA_CFLAGS .= $Config{ccflags};
-}
-
-# apache-1.3.xx won't compile with -D_GNU_SOURCE
-$PERL_EXTRA_CFLAGS =~ s/-D_GNU_SOURCE//;
-
for (keys %PassEnv) {
$ENV{$_} = $$_ if $$_;
}
-430,6 +423,13
system_sanity_check();
+if ($PERL_USELARGEFILES and $] = 5.006) {
+$PERL_EXTRA_CFLAGS .= $Config{ccflags};
+}
+
+# apache-1.3.xx won't compile with -D_GNU_SOURCE
+$PERL_EXTRA_CFLAGS =~ s/-D_GNU_SOURCE//;
+
if ($USE_APACI) {
print Will configure via APACI;
if($USE_DSO) {
-2459,6 +2459,9
local $Apache::src::APXS = $WITH_APXS;
my $cflags = Apache::src-new-apxs('-q' = 'CFLAGS') || '';
return if $cflags =~ /LARGEFILE/;
+
+$PERL_USELARGEFILES=0; #just do it since
+return; #nobody seems to listen to the warning below
phat_warn(EOF);
Your Perl is uselargefiles enabled, but Apache is not, suggestions:
cvs commit: modperl Changes Makefile.PL STATUS
dougm 02/05/22 20:38:39
Modified:.Changes Makefile.PL STATUS
Log:
Submitted by: Randy Kobes [EMAIL PROTECTED]
Reviewed by: dougm
fix Win32 build problems with spaces in shell arguments
Revision ChangesPath
1.644 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -r1.643 -r1.644
--- Changes 23 May 2002 03:07:27 - 1.643
+++ Changes 23 May 2002 03:38:39 - 1.644
@@ -10,6 +10,9 @@
=item 1.26_01-dev
+fix Win32 build problems with spaces in shell arguments
+[Randy Kobes [EMAIL PROTECTED]]
+
make sure DynaLoader is loaded before XSLoader to workaround possible
segv when using mod_perl as a dso with perl 5.6.1
1.202 +1 -1 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- Makefile.PL 23 May 2002 02:52:15 - 1.201
+++ Makefile.PL 23 May 2002 03:38:39 - 1.202
@@ -1104,7 +1104,7 @@
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');
+ 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,
1.19 +1 -7 modperl/STATUS
Index: STATUS
===
RCS file: /home/cvs/modperl/STATUS,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- STATUS14 May 2002 18:05:34 - 1.18
+++ STATUS23 May 2002 03:38:39 - 1.19
@@ -1,5 +1,5 @@
mod_perl 1.3 STATUS:
- Last modified at [$Date: 2002/05/14 18:05:34 $]
+ Last modified at [$Date: 2002/05/23 03:38:39 $]
Release:
@@ -9,12 +9,6 @@
Available Patches:
-
-* Win32 build problems with spaces in shell arguments
-Report: http://marc.theaimsgroup.com/?l=apache-modperlm=101681938513575w=2
- Status:
- patch available at
- http://marc.theaimsgroup.com/?l=apache-modperlm=101729204503165w=2
* implement notes('error-notes') in Registry a la mod_cgo
Report: http://marc.theaimsgroup.com/?l=apache-modperlm=101862462900504w=2
cvs commit: modperl Changes Makefile.PL
stas02/03/22 11:58:13
Modified:.Changes Makefile.PL
Log:
the first flag argument to perl cannot start with space, since perl tries
to open the -spi.bak as a file. fix that in the win32 case.
Revision ChangesPath
1.626 +4 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- Changes 19 Mar 2002 02:18:02 - 1.625
+++ Changes 22 Mar 2002 19:58:13 - 1.626
@@ -10,6 +10,10 @@
=item 1.26_01-dev
+the first flag argument to perl cannot start with space, since perl tries
+to open the -spi.bak as a file. fix that in the win32 case.
+[Stas Bekman [EMAIL PROTECTED]]
+
starting from perl 5.7.3 for tied filehandles, tiedscalar magic is applied
to the IO slot of the GP rather than the GV itself. adjust the TIEHANDLE
macro to work properly under 5.7.3+. [Charles Jardine [EMAIL PROTECTED],
1.197 +1 -1 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- Makefile.PL 9 Sep 2001 21:56:46 - 1.196
+++ Makefile.PL 22 Mar 2002 19:58:13 - 1.197
@@ -1101,7 +1101,7 @@
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');
+ 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,
cvs commit: modperl Changes Makefile.PL
dougm 01/09/09 14:56:46
Modified:.Changes Makefile.PL
Log:
warn if Perl is configured with -Duseshrplib and a libperl.so is found
in a place where it should not be, example: /lib /usr/lib or /usr/local/lib
Revision ChangesPath
1.622 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- Changes 2001/09/09 18:48:47 1.621
+++ Changes 2001/09/09 21:56:46 1.622
@@ -10,6 +10,9 @@
=item 1.26_01-dev
+warn if Perl is configured with -Duseshrplib and a libperl.so is found
+in a place where it should not be, example: /lib /usr/lib or /usr/local/lib
+
fix potential segv in Apache::URI-rpath
[Vyacheslav Zamyatin [EMAIL PROTECTED]]
1.196 +29 -0 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- Makefile.PL 2001/07/17 15:54:05 1.195
+++ Makefile.PL 2001/09/09 21:56:46 1.196
@@ -2410,6 +2410,7 @@
malloc_check();
uselargefiles_check();
dynaloader_check();
+shrplib_check();
if ($USE_APXS and $Config{libs} =~ /($thrlib)/) {
my $lib = $1;
@@ -2560,4 +2561,32 @@
/* Added by Wayne Scott
EOF
+}
+
+sub shrplib_check {
+return unless $Config{'useshrplib'} and
+ $Config{'useshrplib'} eq 'define';
+
+my $libperl = $Config{'libperl'} || 'libperl.so';
+
+for my $dir (qw(/lib /usr/lib /usr/local/lib)) {
+next unless -e $dir/$libperl;
+
+my $coredir = $Config{'archlibexp'}/CORE;
+my $corelib = $coredir/$libperl;
+
+phat_warn(EOF);
+$dir/$libperl might override
+$corelib
+
+This may cause build or runtime errors with mod_perl.
+Consider removing $dir/$libperl, it should not be there.
+
+If your vendor has installed $libperl there, complain to them and install
+Perl from source if needed.
+
+$libperl should only exist in Perl version/arch directories, for example:
+$coredir
+EOF
+}
}
cvs commit: modperl Changes Makefile.PL
dougm 01/05/01 10:08:25
Modified:.Changes Makefile.PL
Log:
fix 'make offsite-tar'
Revision ChangesPath
1.590 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.589
retrieving revision 1.590
diff -u -r1.589 -r1.590
--- Changes 2001/04/27 17:01:53 1.589
+++ Changes 2001/05/01 17:08:25 1.590
@@ -10,6 +10,8 @@
=item 1.25_01-dev
+fix 'make offsite-tar' [Geoffrey Young [EMAIL PROTECTED]]
+
win32 fixes [Randy Kobes [EMAIL PROTECTED]]
fix double-loading bug of Perl{Require,Module}s at startup time
1.184 +7 -3 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- Makefile.PL 2001/04/27 17:01:53 1.183
+++ Makefile.PL 2001/05/01 17:08:25 1.184
@@ -1390,13 +1390,17 @@
offsite-tar:
$(CP) MANIFEST MANIFEST.orig
- $(PERL) -e 'for ($(APACHE_SRC)/*.h) {' \
- -e 'system $(CP) $$_ src/;' \
+ echo src/Makefile.config MANIFEST
+ $(CP) $(APACHE_SRC)/Makefile.config src/Makefile.config
+ mkdir src/include
+ $(PERL) -e 'for ($(APACHE_SRC)/include/*.h) {' \
+ -e 'system $(CP) $$_ src/include/;' \
-e 's,^$(APACHE_SRC),,;' \
-e 'system echo src$$_ MANIFEST;' \
-e '}'
$(MAKE) dist
- $(RM_F) src/*.h
+ $(RM_RF) src/include/
+ $(RM) src/Makefile.config
$(MV) MANIFEST.orig MANIFEST
EOF
cvs commit: modperl Changes Makefile.PL
dougm 01/04/17 15:39:09
Modified:.Changes Makefile.PL
Log:
improve Apache::MyConfig
Revision ChangesPath
1.587 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- Changes 2001/04/17 22:01:13 1.586
+++ Changes 2001/04/17 22:39:06 1.587
@@ -10,6 +10,8 @@
=item 1.25_01-dev
+improve Apache::MyConfig [Stas Bekman [EMAIL PROTECTED]]
+
back out 'stop win32 crash when bringing down service' change, no
longer needed with 1.3.19
[John Sterling, Will Rowe]
1.180 +18 -15modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- Makefile.PL 2001/04/17 21:38:52 1.179
+++ Makefile.PL 2001/04/17 22:39:07 1.180
@@ -95,6 +95,7 @@
$Apache::MyConfig::Setup{Apache_Src} ;
my $PWD = cwd;
+$ENV{APACHE_CWD} = $PWD;
$ENV{PERL5LIB} = "$PWD/lib";
my %SSL = (
@@ -1977,9 +1978,23 @@
EOS
}
-local *FH;
-# writing Configuration to Apache::MyConfig
+# preparing and writing Configuration to Apache::MyConfig
+my %my_config = %callback_hooks;
+my @other_hooks = qw(APACHE_SRC SSL_BASE APXS PERL_USELARGEFILES
+ PERL_TRACE PERL_DEBUG APACI_ARGS APACHE_PREFIX
+ DO_HTTPD NO_HTTPD PREP_HTTPD USE_APACI
+ APACHE_HEADER_INSTALL PERL_STATIC_EXTS );
+{
+no strict 'refs';
+$my_config{$_} = ${$_} for @other_hooks;
+}
+my $my_config_dump = join ",\n",
+map { qq{'$_' = } .
+ ($my_config{$_} =~ /^\d+$/ ? $my_config{$_} : qq{'$my_config{$_}'})
+} sort keys %my_config;
+
+local *FH;
open FH, 'lib/Apache/MyConfig.pm' ||
die "Can't open lib/Apache/MyConfig.pm: $!";
print FH EOT;
@@ -1989,20 +2004,8 @@
package Apache::MyConfig;
%Setup = (
- 'Apache_Src' = \'$APACHE_SRC\',
- 'SSL_BASE' = \'$SSL_BASE\',
- 'APXS' = \'$WITH_APXS\',
- 'PERL_USELARGEFILES' = \'$PERL_USELARGEFILES\',
-EOT
-
- foreach my $key (sort @callback_hooks) {
-print FH " \'$key\' = \'$callback_hooks{$key}\',\n";
- }
-
- print FH EOT;
- $string
+$my_config_dump
);
-
1;
__END__
cvs commit: modperl Changes Makefile.PL
dougm 00/04/20 22:56:20
Modified:.Changes Makefile.PL
Log:
--disable-rule=EXPAT is passed to Apache's configure to avoid
XML::Parser conflicts
Revision ChangesPath
1.470 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- Changes 2000/04/13 23:31:50 1.469
+++ Changes 2000/04/21 05:56:19 1.470
@@ -10,6 +10,9 @@
=item 1.22_01-dev
+--disable-rule=EXPAT is passed to Apache's configure to avoid
+XML::Parser conflicts
+
User/Group for 'make test' can be overridden with the environment
variables APACHE_USER/APACHE_GROUP
1.157 +2 -1 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- Makefile.PL 2000/04/13 23:31:50 1.156
+++ Makefile.PL 2000/04/21 05:56:19 1.157
@@ -936,7 +936,8 @@
}
$cmd .= "./configure " .
- "--activate-module=src/modules/perl/libperl.a";
+ "--activate-module=src/modules/perl/libperl.a" .
+" --disable-rule=EXPAT";
if($USE_DSO) {
$cmd .= " --enable-shared=perl";
