dougm 01/04/27 10:01:55 Modified: . Changes Makefile.PL ToDo src/modules/win32 mod_perl.dsp t/conf httpd.conf-win32 Log: win32 fixes Revision Changes Path 1.589 +2 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.588 retrieving revision 1.589 diff -u -r1.588 -r1.589 --- Changes 2001/04/26 05:30:44 1.588 +++ Changes 2001/04/27 17:01:53 1.589 @@ -10,6 +10,8 @@ =item 1.25_01-dev +win32 fixes [Randy Kobes <[EMAIL PROTECTED]>] + fix double-loading bug of Perl{Require,Module}s at startup time improve Apache::MyConfig [Stas Bekman <[EMAIL PROTECTED]>] 1.183 +15 -11 modperl/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl/Makefile.PL,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- Makefile.PL 2001/04/25 04:18:22 1.182 +++ Makefile.PL 2001/04/27 17:01:53 1.183 @@ -1932,6 +1932,15 @@ } chdir "../../../"; + + open(F, '>t/docs/init.pl') + or die "Cannot open t/docs/init.pl: $!"; + print F <<"END"; +#!perl +\$Apache::Server::CWD = '$PWD'; + +END + close F; } sub dirent_kludge { @@ -1967,16 +1976,6 @@ sub write_my_config { my $src = shift; - - my $string; - if ($win32_auto) { - $string =<<"EOS"; -'APACHE_INC' => '$win32_path{APACHE_INC}', - 'APACHE_LIB' => '$win32_path{APACHE_LIB}', - 'MODPERL_INC' => '$win32_path{MODPERL_INC}', - 'MODPERL_LIB' => '$win32_path{MODPERL_LIB}', -EOS - } # preparing and writing Configuration to Apache::MyConfig my %my_config = %callback_hooks; @@ -1989,6 +1988,11 @@ no strict 'refs'; $my_config{$_} = ${$_} for @other_hooks; } + if ($win32_auto) { + for (qw(APACHE_INC APACHE_LIB MODPERL_INC MODPERL_LIB)) { + $my_config{$_} = $win32_path{$_}; + } + } #need this alias for Apache::src backwards compat $my_config{'Apache_Src'} = $my_config{'APACHE_SRC'}; @@ -2117,7 +2121,7 @@ } elsif (/ADD CPP/) { my $apache_inc = win32_fix_path_dsp($win32_path{APACHE_INC}); - s!(/D "WIN32")!/I "$apache_inc" /I "$perl_inc" $1!; + s!(/D "WIN32")!/I "$apache_inc" /I "$apache_inc/../os/win32" /I "$perl_inc" $1!; s!(/D "WIN32")!$1 /D "EAPI" ! if $win32_args{EAPI}; print NEWDSP $_; } 1.280 +4 -3 modperl/ToDo Index: ToDo =================================================================== RCS file: /home/cvs/modperl/ToDo,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- ToDo 2001/02/17 00:06:12 1.279 +++ ToDo 2001/04/27 17:01:54 1.280 @@ -3,6 +3,10 @@ (well, close to it anyhow) --------------------------------------------------------------------------- +- readdir() broken with glibc 2.2 + +- PERL5LIB foo + - From: Daniel Jacobowitz <[EMAIL PROTECTED]> Subject: New method $req->allowed() for libapache-mod-perl @@ -11,9 +15,6 @@ - From: Joshua Chamas <[EMAIL PROTECTED]> Subject: Apache::SizeLimit patches - -- From: Stas Bekman <[EMAIL PROTECTED]> - Subject: Makefile.PL patch - 1.25 Apache::ExtUtils fix broke elsewhere 1.3 +3 -3 modperl/src/modules/win32/mod_perl.dsp Index: mod_perl.dsp =================================================================== RCS file: /home/cvs/modperl/src/modules/win32/mod_perl.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_perl.dsp 2001/01/01 00:20:19 1.2 +++ mod_perl.dsp 2001/04/27 17:01:54 1.3 @@ -42,7 +42,7 @@ # 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 CPP /nologo /MD /W3 /GX /O2 /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" @@ -67,7 +67,7 @@ # 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 CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /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" @@ -159,7 +159,7 @@ # End Source File # Begin Source File -SOURCE="\unzipped\ap\modperl\..\apache-1.3\src\Release\ApacheCore.lib" +SOURCE=..\..\..\..\Apache\ApacheCore.lib # End Source File # Begin Source File 1.11 +2 -0 modperl/t/conf/httpd.conf-win32 Index: httpd.conf-win32 =================================================================== RCS file: /home/cvs/modperl/t/conf/httpd.conf-win32,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- httpd.conf-win32 2000/12/31 19:34:16 1.10 +++ httpd.conf-win32 2001/04/27 17:01:55 1.11 @@ -32,6 +32,8 @@ PerlSetVar KeyForPerlSetVar OK +PerlRequire docs/init.pl + PerlRequire docs/startup.pl PerlTransHandler PerlTransHandler