X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FTest.pm;h=3aa9878c15476d2289970c90cb167123bfc9db1e;hp=9f2f7bed59a65a2798d308fa2a03aa2444b983ab;hb=76cd7fac9dc64316080d5617166d13bb24f058e5;hpb=168f570c47f586d5a7e75c4afa46b3f470ad8082

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index 9f2f7be..3aa9878 100644
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -136,6 +136,21 @@ sub remote_request {
 
     if ( $server->path =~ m|^(.+)?/$| ) {
         $server->path("$1");    # need to be quoted
+        }
+
+    # the request path needs to be sanitised if $server is using a
+    # non-root path due to potential overlap between request path and
+    # response path.
+    if ($server->path) {
+        my @sp = split '/', $server->path;
+        my @rp = split '/', $request->uri->path;
+        shift @sp;shift @rp; # leading /
+        if (@rp) {
+            foreach my $sp (@sp) {
+                shift @rp if $sp eq $rp[0];
+            }
+        }
+        $request->uri->path(join '/', @rp);
     }
 
     # the request path needs to be sanitised if $server is using a