perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject svn commit: r189913 - in /perl/modperl/trunk: Changes lib/Apache2/Build.pm
Date Fri, 10 Jun 2005 07:22:39 GMT
Author: gozer
Date: Fri Jun 10 00:22:39 2005
New Revision: 189913

URL: http://svn.apache.org/viewcvs?rev=189913&view=rev
Log:
Fix a broken regexp in Apache2::Build::dir() on win32 that would
incorrectly attempt to fully-qualify paths like c:/some/path

Submitted-By: Nick *** <doink123@abv.bg>


Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/lib/Apache2/Build.pm

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=189913&r1=189912&r2=189913&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Jun 10 00:22:39 2005
@@ -12,6 +12,10 @@
 
 =item 2.0.1-dev
 
+Fix a broken regexp in Apache2::Build::dir() on win32 that would
+incorrectly attempt to fully-qualify paths like c:/some/path
+[Nick *** <doink123@abv.bg>]
+
 Fix the "No library found" warnings when building on win32 without
 apxs and MP_AP_PREFIX [Nick *** <doink123@abv.bg>]
 

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=189913&r1=189912&r2=189913&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Fri Jun 10 00:22:39 2005
@@ -932,7 +932,7 @@
         for (qw(ap_includedir)) {
             delete $self->{$_};
         }
-        if ($dir =~ m:^../:) {
+        if ($dir =~ m:^\.\.[/\\]:) {
             $dir = "$self->{cwd}/$dir";
         }
         $self->{dir} = $dir;



Mime
View raw message