You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ra...@apache.org on 2004/03/26 05:15:51 UTC

cvs commit: modperl-2.0/lib/ModPerl MM.pm

randyk      2004/03/25 20:15:51

  Modified:    .        Changes
               lib/ModPerl MM.pm
  Log:
  fix installation on Win32 so that an Apache2/ subdirectory under the
  Perl tree is used when MP_INST_APACHE2 is specified.
  
  Revision  Changes    Path
  1.353     +4 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.352
  retrieving revision 1.353
  diff -u -r1.352 -r1.353
  --- Changes	24 Mar 2004 23:36:48 -0000	1.352
  +++ Changes	26 Mar 2004 04:15:51 -0000	1.353
  @@ -12,6 +12,10 @@
   
   =item 1.99_14-dev
   
  +Fix the installation on Win32 so that an appropriate Apache2
  +subdirectory under the Perl tree is used when MP_INST_APACHE2 is
  +specified [Randy Kobes]
  +
   Fix a redefined warning in Apache::Status [Stas]
   
   Fix Apache::Status, to lookup the Apache::Request version without
  
  
  
  1.32      +1 -1      modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- MM.pm	4 Mar 2004 06:01:06 -0000	1.31
  +++ MM.pm	26 Mar 2004 04:15:51 -0000	1.32
  @@ -90,7 +90,7 @@
       if (build_config('MP_INST_APACHE2')) {
           while (my($k,$v) = each %$hash) {
               delete $hash->{$k};
  -            $k =~ s:/Apache2$::;
  +            $k =~ s{[/\\:]Apache2$}{};
               $hash->{$k} = $v;
           }
       }