Return-Path: 
 <modperl-cvs-return-5604-apmail-perl-modperl-cvs-archive=perl.apache.org@perl.apache.org>
Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org
Received: (qmail 48721 invoked from network); 10 Jun 2005 14:29:45 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Jun 2005 14:29:45 -0000
Received: (qmail 22027 invoked by uid 500); 10 Jun 2005 14:29:45 -0000
Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org
Received: (qmail 22008 invoked by uid 500); 10 Jun 2005 14:29:44 -0000
Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:modperl-cvs-help@perl.apache.org>
list-unsubscribe: <mailto:modperl-cvs-unsubscribe@perl.apache.org>
List-Post: <mailto:modperl-cvs@perl.apache.org>
Reply-To: dev@perl.apache.org
List-Id: <modperl-cvs.perl.apache.org>
Delivered-To: mailing list modperl-cvs@perl.apache.org
Received: (qmail 21993 invoked by uid 99); 10 Jun 2005 14:29:44 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 10 Jun 2005 07:29:39 -0700
Received: (qmail 9769 invoked by uid 65534); 10 Jun 2005 07:22:40 -0000
Message-ID: <20050610072240.9768.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r189913 - in /perl/modperl/trunk: Changes
 lib/Apache2/Build.pm
Date: Fri, 10 Jun 2005 07:22:39 -0000
To: modperl-cvs@perl.apache.org
From: gozer@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: gozer
Date: Fri Jun 10 00:22:39 2005
New Revision: 189913

URL: http://svn.apache.org/viewcvs?rev=3D189913&view=3Drev
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=3D189913&=
r1=3D189912&r2=3D189913&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Fri Jun 10 00:22:39 2005
@@ -12,6 +12,10 @@
=20
 =3Ditem 2.0.1-dev
=20
+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>]
=20

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?=
rev=3D189913&r1=3D189912&r2=3D189913&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 =3D~ m:^../:) {
+        if ($dir =3D~ m:^\.\.[/\\]:) {
             $dir =3D "$self->{cwd}/$dir";
         }
         $self->{dir} =3D $dir;