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=e2e467bce016e7f735cf5f32cca9ee16f7044176;hpb=58f5682a9e1df884fc01ec9e180d225506fc60ff;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/conf/extra.conf.in b/t/conf/extra.conf.in
index e2e467b..3b64074 100644
--- a/t/conf/extra.conf.in
+++ b/t/conf/extra.conf.in
@@ -1,11 +1,41 @@
+<IfDefine !APACHE1>
+    # Needed to pass some %2F tests
+    AllowEncodedSlashes on
+</IfDefine>
+
 # CGI
 <IfModule @CGI_MODULE@>
-    ScriptAlias /cgi/ @ServerRoot@/var/TestApp/script/testapp_cgi.pl/
+    ScriptAlias /cgi/ @ServerRoot@/tmp/TestApp/script/testapp_cgi.pl/
+
+    # 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>
 </IfModule>
 
 # FastCGI
 <IfModule mod_fastcgi.c>
-    FastCgiIpcDir @ServerRoot@/var/tmp
-    FastCgiServer @ServerRoot@/var/TestApp/script/testapp_fastcgi.pl -idle-timeout 300 -processes 5
-    ScriptAlias /fastcgi/ @ServerRoot@/var/TestApp/script/testapp_fastcgi.pl/
+    FastCgiIpcDir @ServerRoot@/tmp/tmp
+    FastCgiServer @ServerRoot@/tmp/TestApp/script/testapp_fastcgi.pl -idle-timeout 300 -processes 1
+
+    # 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>