From: Orlando Vazquez <ovazquez@gmail.com>
Date: Sun, 31 May 2009 20:04:42 +0000 (+0000)
Subject: Remove overridden prepare_path that was mangling the applicaiton prefix
X-Git-Tag: 0.03~10
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Engine-SCGI.git;a=commitdiff_plain;h=e069caf51a25bc0e2a82b874c7aa4655c1bba0d0

Remove overridden prepare_path that was mangling the applicaiton prefix
---

diff --git a/lib/Catalyst/Engine/SCGI.pm b/lib/Catalyst/Engine/SCGI.pm
index 808dfdd..3b6fb8b 100644
--- a/lib/Catalyst/Engine/SCGI.pm
+++ b/lib/Catalyst/Engine/SCGI.pm
@@ -86,51 +86,6 @@ sub write {
     $self->{_request}->connection->print($buffer);
 }
 
-=head2 $self->prepare_path($c)
-
-=cut
-sub prepare_path {
-    my ( $self, $c ) = @_;
-    local (*ENV) = $self->env || \%ENV;
-
-    my $scheme = $c->request->secure ? 'https' : 'http';
-    my $host      = $ENV{HTTP_HOST}   || $ENV{SERVER_NAME};
-    my $port      = $ENV{SERVER_PORT} || 80;
-    my $base_path;
-    if ( exists $ENV{REDIRECT_URL} ) {
-        $base_path = $ENV{REDIRECT_URL};
-        $base_path =~ s/$ENV{PATH_INFO}$//;
-    }
-    else {
-        $base_path = $ENV{SCRIPT_NAME} || '/';
-    }
-
-    my $path = $base_path . ( $ENV{PATH_INFO} || '' );
-    $path =~ s{^/+}{};
-
-    my $uri = $uri_proto->clone;
-    $uri->scheme($scheme);
-    $uri->host($host);
-    $uri->port($port);
-    $uri->path($path);
-    $uri->query( $ENV{QUERY_STRING} ) if $ENV{QUERY_STRING};
-
-    # sanitize the URI
-    $uri = $uri->canonical;
-    $c->request->uri($uri);
-
-    # set the base URI
-    # base must end in a slash
-    $base_path .= '/' unless ( $base_path =~ /\/$/ );
-    my $base = $uri->clone;
-    
-    my ($base_uri) = $base_path=~ /(.*?)\//;
-    $base_uri .= '/' unless ($base_uri =~/\/$/ );
-    
-    $base->path_query($base_uri);
-    $c->request->base($base);
-}
-
 =head2 $self->read_chunk ( $c, $buffer, $readlen )
  
  Read Body content to $_[3]'s set length and direct output to $_[2].
diff --git a/t/engine-scgi.t b/t/engine-scgi.t
new file mode 100644
index 0000000..b9e0a6a
--- /dev/null
+++ b/t/engine-scgi.t
@@ -0,0 +1,29 @@
+#!perl
+
+use strict;
+use warnings;
+
+use Test::More tests => 2;
+
+use_ok('Catalyst');
+
+scgi_application_prefix: {
+    my $request = Catalyst::Request->new;
+
+    $ENV{HTTP_HOST} = "127.0.0.1";
+    $ENV{SERVER_PORT} = 80;
+    $ENV{SCRIPT_NAME} = '/MyApp';
+    $ENV{PATH_INFO} = '/some/path';
+
+    my $c = Catalyst->new({
+      request => $request,
+    });
+    $c->setup_engine('SCGI');
+    $c->prepare_path;
+
+    is (
+        Catalyst::uri_for( $c, '/some/path' )->as_string,
+        'http://127.0.0.1/MyApp/some/path',
+        'uri_for creates url with correct application prefix'
+    );
+}