dougm 00/12/31 11:34:17
Modified: . Changes INSTALL.win32 MANIFEST Makefile.PL
t TEST.win32
t/conf httpd.conf-win32 httpd.conf.pl
Added: src/modules/win32 mod_perl.def mod_perl.dsp
Log:
win32 updates for 1.3.15, including ApacheModulePerl.{dsp,dll} ->
mod_perl.{dsp,so} rename
Revision Changes Path
1.567 +5 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- Changes 2000/12/30 05:08:55 1.566
+++ Changes 2000/12/31 19:34:15 1.567
@@ -10,6 +10,11 @@
=item 1.24_02-dev
+win32 updates for 1.3.15, including ApacheModulePerl.{dsp,dll} ->
+mod_perl.{dsp,so} rename
+[John K. Sterling <[EMAIL PROTECTED]>,
+Randy Kobes <[EMAIL PROTECTED]>]
+
fix directive handlers bug triggered by LoadModule foo_module
allow $r->finfo to be modified
1.6 +23 -11 modperl/INSTALL.win32
Index: INSTALL.win32
===================================================================
RCS file: /home/cvs/modperl/INSTALL.win32,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- INSTALL.win32 2000/12/21 19:19:08 1.5
+++ INSTALL.win32 2000/12/31 19:34:16 1.6
@@ -24,6 +24,17 @@
See http://perl.apache.org/distributions.html for Win32 binaries,
including ActivePerl ppms of mod_perl and some Apache::* packages.
+=head1 CHANGES
+
+Beginning with version 1.3.15, Apache has changed the convention
+for naming Win32 modules in order to follow that for Unix systems.
+Consequently, the name of the mod_perl module built here has
+been changed from ApacheModulePerl.dll to mod_perl.so. This
+is just a change in convention; if you are building mod_perl
+against pre-1.3.15 Apache sources, and wish to follow the old
+convention, simply copy mod_perl.so to your Apache modules directory
+as ApacheModulePerl.dll.
+
=head1 BUILDING
There are two ways to build mod_perl - with MS Developer Studio,
@@ -40,15 +51,16 @@
perl Makefile.PL
nmake install
-This will install the Perl side of mod_perl and setup files for the library build.
+This will install the Perl side of mod_perl and setup files for the
+library build.
-=item Build ApacheModulePerl.dll
+=item Build mod_perl.so
Using MS developer studio,
select "File -> Open Workspace ...",
select "Files of type [Projects (*.dsp)]"
- open mod_perl-x.xx/src/modules/ApacheModulePerl/ApacheModulePerl.dsp
+ open mod_perl-x.xx/src/modules/win32/mod_perl.dsp
=item Settings
@@ -68,9 +80,9 @@
ApacheCore.lib (e.g. C:\Apache\ApacheCore.lib)
select "Build -> Set Active Configuration... ->
- [ApacheModulePerl - Win32 Release]"
+ [mod_perl - Win32 Release]"
- select "Build -> Build ApacheModulePerl.dll"
+ select "Build -> Build mod_perl.so"
You may see some harmless warnings, which can be reduced (along with
the size of the DLL), by setting:
@@ -80,14 +92,14 @@
=item Testing
-Once ApacheModulePerl.dll is built and apache.exe is installed you may
+Once mod_perl.so is built and apache.exe is installed you may
test mod_perl with:
nmake test
=item Apache setup
-You do not need to rebuild apache, just copy ApacheModulePerl.dll to
+You do not need to rebuild apache, just copy mod_perl.so to
$SERVER_ROOT/modules
=back
@@ -98,7 +110,7 @@
perl Makefile.PL APACHE_SRC=..\apache_1.3.xx INSTALL_DLL=\Apache\modules
-will build mod_perl (including ApacheModulePerl.dll) entirely from
+will build mod_perl (including mod_perl.so) entirely from
the command line. The arguments accepted include
=over 3
@@ -110,9 +122,9 @@
=item INSTALL_DLL
-This gives the location of where to install ApacheModulePerl.dll
+This gives the location of where to install mod_perl.so
(eg, \Apache\modules). No default is assumed - if this argument
-is not given, ApacheModulePerl.dll must be copied manually.
+is not given, mod_perl.so must be copied manually.
=item DEBUG
@@ -141,7 +153,7 @@
Add this line to httpd.conf:
- LoadModule perl_module modules/ApacheModulePerl.dll
+ LoadModule perl_module modules/mod_perl.so
Be sure that 'C:\perl\bin' is in your path so apache can find perl.dll
1.67 +2 -1 modperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/modperl/MANIFEST,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- MANIFEST 2000/12/22 20:55:55 1.66
+++ MANIFEST 2000/12/31 19:34:16 1.67
@@ -97,7 +97,8 @@
src/modules/perl/perlio.c
src/modules/perl/perl_config.c
src/modules/perl/Makefile
-src/modules/ApacheModulePerl/ApacheModulePerl.dsp
+src/modules/win32/mod_perl.dsp
+src/modules/win32/mod_perl.def
src/opcodes.txt
t/report.PL
t/README
1.175 +31 -14 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- Makefile.PL 2000/12/23 02:23:08 1.174
+++ Makefile.PL 2000/12/31 19:34:16 1.175
@@ -1249,6 +1249,17 @@
}
);
+if ($Is_Win32) {
+ print <<'END';
+
+Beginning with version 1.3.15, Apache uses a different convention for
+Win32 module names. Correspondingly, the name of the mod_perl module
+built here has been changed from ApacheModulePerl.dll to mod_perl.so.
+Please see INSTALL.win32 for further details.
+
+END
+}
+
print "*** BSDI users: be sure to read the INSTALL `Notes' section ***\n"
if $Config{osname} =~ /bsdos/i;
@@ -1268,8 +1279,8 @@
my $string = $self->MM::clean(@_);
if ($win32_auto) {
$string .= sprintf
- qq{\tmsdev src\\modules\\ApacheModulePerl\\ApacheModulePerl.dsp \\\n} .
- qq{\t/MAKE "ApacheModulePerl - Win32 %s" /CLEAN\n},
+ qq{\tmsdev src\\modules\\win32\\mod_perl.dsp \\\n} .
+ qq{\t/MAKE "mod_perl - Win32 %s" /CLEAN\n},
($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
return $string;
}
@@ -1313,12 +1324,15 @@
if ($win32_auto) {
$string =~ s/(pure_all\s+::.*\s+subdirs\s+)(.*)/$1 amp_dll $2/;
$string .= sprintf qq{\namp_dll:\n} .
- qq{\tmsdev src\\modules\\ApacheModulePerl\\ApacheModulePerl.dsp \\\n} .
- qq{\t/MAKE "ApacheModulePerl - Win32 %s" /USEENV\n},
+ qq{\tmsdev src\\modules\\win32\\mod_perl.dsp \\\n} .
+ qq{\t/MAKE "mod_perl - Win32 %s" /USEENV\n},
($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
if ($win32_args{INSTALL_DLL}) {
$string .= sprintf qq{\namp_install:\n\t\$(CP) "%s" "%s"},
- "$win32_path{MODPERL_LIB}/ApacheModulePerl.dll", $win32_args{INSTALL_DLL};
+ "$win32_path{MODPERL_LIB}/mod_perl.so",
+ $win32_args{INSTALL_DLL} .
+ ($win32_args{APACHE_VERS} < 1315 ?
+ '/ApacheModulePerl.dll' : '/mod_perl.so');
}
return $string;
}
@@ -2024,8 +2038,8 @@
my $modperl_src = win32_fix_path(cwd) . '/src';
$win32_path{MODPERL_INC} = $modperl_src . '/modules/perl';
$win32_path{MODPERL_LIB} = ($win32_args{DEBUG} == 1) ?
- $modperl_src . '/modules/ApacheModulePerl/Debug' :
- $modperl_src . '/modules/ApacheModulePerl/Release';
+ $modperl_src . '/modules/win32/Debug' :
+ $modperl_src . '/modules/win32/Release';
unless ( -d $win32_args{APACHE_SRC}) {
opendir(DIR, '../') or die "Cannot read parent directory: $!\n";
@@ -2038,9 +2052,12 @@
$win32_args{APACHE_SRC} = win32_fix_path($win32_args{APACHE_SRC});
$win32_args{APACHE_SRC} .= '/src' unless $win32_args{APACHE_SRC} =~ /src$/;
$win32_path{APACHE_INC} = $win32_args{APACHE_SRC} . '/include';
+ $win32_args{APACHE_VERS} = httpd_version($win32_path{APACHE_INC}, 1);
$win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ?
- $win32_args{APACHE_SRC} . '/CoreD' :
- $win32_args{APACHE_SRC} . '/CoreR';
+ $win32_args{APACHE_SRC} .
+ ($win32_args{APACHE_VERS} < 1315 ? '/CoreD' : '/Debug') :
+ $win32_args{APACHE_SRC} .
+ ($win32_args{APACHE_VERS} < 1315 ? '/CoreR' : '/Release');
die "Cannot find ApacheCore.lib under $win32_path{APACHE_LIB}\n"
unless -f "$win32_path{APACHE_LIB}/ApacheCore.lib";
@@ -2060,7 +2077,7 @@
print <<'END';
**** The Apache/modules directory was not found. *******
-**** Please install ApacheModulePerl.dll manually. *******
+**** Please install mod_perl.so manually. *******
END
}
@@ -2068,11 +2085,11 @@
}
}
-# fix ApacheModulePerl.dsp with the perl and apache inc and lib directories
+# fix mod_perl.dsp with the perl and apache inc and lib directories
sub win32_fix_dsp {
- my $amp = 'src/modules/ApacheModulePerl';
- my $dsp = 'ApacheModulePerl.dsp';
+ my $amp = 'src/modules/win32';
+ my $dsp = 'mod_perl.dsp';
unless ( -f "$amp/$dsp.orig") {
rename("$amp/$dsp", "$amp/$dsp.orig")
or die "Couldn't rename $amp/$dsp: $!\n";
@@ -2130,7 +2147,7 @@
return $_;
}
-# fix a path for ApacheModulePerl.dsp
+# fix a path for mod_perl.dsp
sub win32_fix_path_dsp {
local $_ = shift;
tr!/!\\!;
1.1 modperl/src/modules/win32/mod_perl.def
Index: mod_perl.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.1 modperl/src/modules/win32/mod_perl.dsp
Index: mod_perl.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="mod_perl" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=mod_perl - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "mod_perl.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "mod_perl.mak" CFG="mod_perl - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "mod_perl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "mod_perl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "mod_perl - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD
/c
# ADD CPP /nologo /MD /W3 /GX /O2 /I
"\unzipped\ap\modperl\..\apache-1.3\src\include" /I "\Perl\lib\CORE" /D "WIN32" /D
"NDEBUG" /D "_WINSOCK2API_" /D "_MSWSOCK_" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_perl.so"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_perl.so"
!ELSEIF "$(CFG)" == "mod_perl - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I
"\unzipped\ap\modperl\..\apache-1.3\src\include" /I "\Perl\lib\CORE" /D "WIN32" /D
"_DEBUG" /D "_WINSOCK2API_" /D "_MSWSOCK_" /D "_WINDOWS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/mod_perl.so"
/pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/mod_perl.so"
/pdbtype:sept
!ENDIF
# Begin Target
# Name "mod_perl - Win32 Release"
# Name "mod_perl - Win32 Debug"
# Begin Source File
SOURCE=..\perl\Apache.c
# End Source File
# Begin Source File
SOURCE=..\perl\Connection.c
# End Source File
# Begin Source File
SOURCE=..\perl\Constants.c
# End Source File
# Begin Source File
SOURCE=..\perl\dirent.h
# End Source File
# Begin Source File
SOURCE=..\perl\File.c
# End Source File
# Begin Source File
SOURCE=..\perl\Log.c
# End Source File
# Begin Source File
SOURCE=..\perl\mod_perl.c
# End Source File
# Begin Source File
SOURCE=.\mod_perl.def
# End Source File
# Begin Source File
SOURCE=..\perl\mod_perl.h
# End Source File
# Begin Source File
SOURCE=..\perl\mod_perl_opmask.c
# End Source File
# Begin Source File
SOURCE=..\perl\perl_config.c
# End Source File
# Begin Source File
SOURCE=..\perl\perl_util.c
# End Source File
# Begin Source File
SOURCE=..\perl\perlio.c
# End Source File
# Begin Source File
SOURCE=..\perl\perlxsi.c
# End Source File
# Begin Source File
SOURCE=..\perl\Server.c
# End Source File
# Begin Source File
SOURCE=..\perl\Table.c
# End Source File
# Begin Source File
SOURCE=..\perl\URI.c
# End Source File
# Begin Source File
SOURCE=..\perl\Util.c
# End Source File
# Begin Source File
SOURCE="\unzipped\ap\modperl\..\apache-1.3\src\Release\ApacheCore.lib"
# End Source File
# Begin Source File
SOURCE=\Perl\lib\CORE\perl56.lib
# End Source File
# End Target
# End Project
1.4 +4 -4 modperl/t/TEST.win32
Index: TEST.win32
===================================================================
RCS file: /home/cvs/modperl/t/TEST.win32,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TEST.win32 1998/07/23 14:36:28 1.3
+++ TEST.win32 2000/12/31 19:34:16 1.4
@@ -73,13 +73,13 @@
#source or binary distribution
-for (qw(src/modules/ApacheModulePerl/Release
- src/modules/ApacheModulePerl/Debug
+for (qw(src/modules/win32/Release
+ src/modules/win32/Debug
win32/modules))
{
- my $dll = "$_/ApacheModulePerl.dll";
+ my $dll = "$_/mod_perl.so";
next unless -e $dll;
- copy $dll, "t/modules/ApacheModulePerl.dll";
+ copy $dll, "t/modules/mod_perl.so";
last;
}
1.10 +1 -1 modperl/t/conf/httpd.conf-win32
Index: httpd.conf-win32
===================================================================
RCS file: /home/cvs/modperl/t/conf/httpd.conf-win32,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- httpd.conf-win32 1999/01/21 17:04:13 1.9
+++ httpd.conf-win32 2000/12/31 19:34:16 1.10
@@ -19,7 +19,7 @@
#mod_perl stuff
-LoadModule perl_module modules/ApacheModulePerl.dll
+LoadModule perl_module modules/mod_perl.so
#-Tw
1.25 +1 -1 modperl/t/conf/httpd.conf.pl
Index: httpd.conf.pl
===================================================================
RCS file: /home/cvs/modperl/t/conf/httpd.conf.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- httpd.conf.pl 1999/05/20 00:22:13 1.24
+++ httpd.conf.pl 2000/12/31 19:34:17 1.25
@@ -1,7 +1,7 @@
#PerlOpmask default
<IfModule mod_dll.c>
-LoadModule perl_module modules/ApacheModulePerl.dll
+LoadModule perl_module modules/mod_perl.so
</IfModule>
AddType text/x-server-parsed-html .shtml
