X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fconf%2Fextra.conf.in;h=3b64074ddfd3fc6b37d72d708f830c498bca2c3b;hb=55a7d9850d78f35c8950eacbdb881d68c71c6bf6;hp=27a7b5f97480ccd9c18bddc1f40c66b5a3af3e87;hpb=690ee03644105e56c9a44310a5977209a19dce02;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/conf/extra.conf.in b/t/conf/extra.conf.in
index 27a7b5f..3b64074 100644
--- a/t/conf/extra.conf.in
+++ b/t/conf/extra.conf.in
@@ -9,8 +9,14 @@
 
     # REDIRECT_URL test
     <IfModule mod_rewrite.c>
+        # Fix trailing slash on /cgi
+        # one CGI test will fail if you don't have mod_rewrite enabled
+        RewriteEngine on
+        RewriteRule /cgi$ /cgi/ [PT]
+
         <Location /rewrite>
             RewriteEngine on
+            RewriteRule /rewrite$ /rewrite/ [PT]
             RewriteRule /rewrite/(.*) /cgi/$1
         </Location>
     </IfModule>
@@ -20,5 +26,16 @@
 <IfModule mod_fastcgi.c>
     FastCgiIpcDir @ServerRoot@/tmp/tmp
     FastCgiServer @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl -idle-timeout 300 -processes 1
-    ScriptAlias /fastcgi/ @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl/
+
+    # Test at a non-root location
+    ScriptAlias /fastcgi/deep/path/ @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl/
+
+    # Test at root
+    ScriptAlias / @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl/
+
+    <IfModule mod_rewrite.c>
+        # Fix trailing slash
+        RewriteEngine on
+        RewriteRule /fastcgi/deep/path$ /fastcgi/deep/path/ [PT]
+    </IfModule>
 </IfModule>