You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by rp...@apache.org on 2010/12/20 14:52:03 UTC

svn commit: r1051104 - /httpd/test/framework/trunk/t/conf/cache.conf.in

Author: rpluem
Date: Mon Dec 20 13:52:02 2010
New Revision: 1051104

URL: http://svn.apache.org/viewvc?rev=1051104&view=rev
Log:
* Use the same virtual host for mod_disk_cache and mod_cache_disk as they
  would get different ports assigned if separated and the tests in
  t/modules/cache.t know only about one port and thus fail for mod_disk_cache.

Modified:
    httpd/test/framework/trunk/t/conf/cache.conf.in

Modified: httpd/test/framework/trunk/t/conf/cache.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/cache.conf.in?rev=1051104&r1=1051103&r2=1051104&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/cache.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/cache.conf.in Mon Dec 20 13:52:02 2010
@@ -3,26 +3,23 @@
 #
 
 <IfModule mod_cache.c>
+    <VirtualHost mod_cache>
     <IfModule mod_disk_cache.c>
 
-        <VirtualHost mod_cache>
             CacheEnable    disk /cache/
             CacheRoot      @SERVERROOT@/conf/cacheroot/ 
             CacheDirLevels 1
             CacheDirLength 1
 
-            DocumentRoot @SERVERROOT@/htdocs/modules/cache
-        </VirtualHost>
    </IfModule>
    <IfModule mod_cache_disk.c>
 
-        <VirtualHost mod_cache>
             CacheEnable    disk /cache/
             CacheRoot      @SERVERROOT@/conf/cacheroot/ 
             CacheDirLevels 1
             CacheDirLength 1
 
-            DocumentRoot @SERVERROOT@/htdocs/modules/cache
-        </VirtualHost>
    </IfModule>
+   DocumentRoot @SERVERROOT@/htdocs/modules/cache
+   </VirtualHost>
 </IfModule>