perl-test-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r1180971 - in /perl/Apache-Test/trunk: Changes lib/Apache/TestConfig.pm
Date Mon, 10 Oct 2011 13:56:32 GMT
Author: torsten
Date: Mon Oct 10 13:56:31 2011
New Revision: 1180971

URL: http://svn.apache.org/viewvc?rev=1180971&view=rev
Log:
As of httpd revision 1053230 (version 2.3.11) the NameVirtualHost directive
became superfluous and a warning is issued when it is met. So, Apache::Test
now wraps NameVirtualHost directives in <IfVersion> blocks.

Suggested by Kaspar Brand <httpd-dev.2011@velox.ch>

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

Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=1180971&r1=1180970&r2=1180971&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Mon Oct 10 13:56:31 2011
@@ -8,6 +8,11 @@ Changes - Apache::Test change logfile
 
 =item 1.37-dev
 
+As of httpd revision 1053230 (version 2.3.11) the NameVirtualHost directive
+became superfluous and a warning is issued when it is met. So, Apache::Test
+now wraps NameVirtualHost directives in <IfVersion> blocks.
+[Kaspar Brand <httpd-dev.2011@velox.ch>]
+
 Add comments about the source files of auto configurated tests to
 the generated httpd.conf and improve indentation a bit. [Torsten Foertsch]
 

Modified: perl/Apache-Test/trunk/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfig.pm?rev=1180971&r1=1180970&r2=1180971&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfig.pm Mon Oct 10 13:56:31 2011
@@ -1240,7 +1240,9 @@ sub parse_vhost {
         @out_config = ([Listen => '0.0.0.0:' . $port]);
 
         if ($self->{vhosts}->{$module}->{namebased}) {
-            push @out_config => [NameVirtualHost => "*:$port"];
+            push @out_config => ["<IfVersion < 2.3.11>\n".
+                                 "${indent}${indent}NameVirtualHost"
+                                 => "*:$port\n${indent}</IfVersion>"];
         }
     }
 



Mime
View raw message