perl-test-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pgollu...@apache.org
Subject svn commit: r293485 - in /perl/Apache-Test/trunk: Changes lib/Apache/TestConfigParse.pm
Date Tue, 04 Oct 2005 01:43:55 GMT
Author: pgollucci
Date: Mon Oct  3 18:43:51 2005
New Revision: 293485

URL: http://svn.apache.org/viewcvs?rev=293485&view=rev
Log:
prevent the config file from being overwritten under certain conditions.

Submitted by: Randy Kobes


Modified:
    perl/Apache-Test/trunk/Changes
    perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm

Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/Changes?rev=293485&r1=293484&r2=293485&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Oct  3 18:43:51 2005
@@ -8,6 +8,10 @@
 
 =item 1.27-dev
 
+Prevent the config file from being overwritten
+on platforms such as WIN32 under certain conditions.
+[Randy Kobes]
+
 make sure that the TESTS Makefile.PL parameter is properly
 recognized ["Christopher H. Laco" <apache-test chrislaco.com>]
 

Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm?rev=293485&r1=293484&r2=293485&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm Mon Oct  3 18:43:51 2005
@@ -347,14 +347,16 @@
             $file = catfile $base, $default_conf;
 
             # SERVER_CONFIG_FILE might be an absolute path
-            if (! -e $file && -e $default_conf) {
-                $file = $default_conf;
-            }
-            else {
-                # try a little harder
-                if (my $root = $self->{httpd_defines}->{HTTPD_ROOT}) {
-                    debug "using HTTPD_ROOT to resolve $default_conf";
-                    $file = catfile $root, $default_conf;
+            unless (-e $file) {
+                if (-e $default_conf) {
+                    $file = $default_conf;
+                }
+                else {
+                    # try a little harder
+                    if (my $root = $self->{httpd_defines}->{HTTPD_ROOT}) {
+                        debug "using HTTPD_ROOT to resolve $default_conf";
+                        $file = catfile $root, $default_conf;
+                    }
                 }
             }
         }



Mime
View raw message