svn commit: r384389 - in /perl/Apache-Test/trunk: Changes lib/Apache/TestServer.pm

[ge...@apache.org]

Author: geoff
Date: Wed Mar  8 16:35:31 2006
New Revision: 384389

URL: http://svn.apache.org/viewcvs?rev=384389&view=rev
Log:
the -t_pid_file code resulted in confusing and fatal error message
for people using stale 1.27 configurations.  so take steps to make
sure things continue to work

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

Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/Changes?rev=384389&r1=384388&r2=384389&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Wed Mar  8 16:35:31 2006
@@ -8,6 +8,10 @@
 
 =item 1.29-dev
 
+the -t_pid_file code resulted in confusing and fatal error message
+for people using stale 1.27 configurations.  so take steps to make
+sure things continue to work.  [Geoffrey Young]
+
 
 =item 1.28 - February 22, 2006 
 

Modified: perl/Apache-Test/trunk/lib/Apache/TestServer.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/lib/Apache/TestServer.pm?rev=384389&r1=384388&r2=384389&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestServer.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestServer.pm Wed Mar  8 16:35:31 2006
@@ -118,7 +118,10 @@
 
 sub pid_file {
     my $self = shift;
-    $self->{config}->{vars}->{t_pid_file};
+
+    my $vars = $self->{config}->{vars};
+
+    return $vars->{t_pid_file} || catfile $vars->{t_logs}, 'httpd.pid';
 }
 
 sub dversion {