minor bugfixes

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 05e86ea..ef29357 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -141,6 +141,9 @@ sub prepare_headers {
 
 sub prepare_parameters {
     my $c    = shift;
+
+    $c->cgi->parse_query_string;
+ 
     my %vars = $c->cgi->Vars;
     while ( my ( $key, $value ) = each %vars ) {
         my @values = split "\0", $value;

diff --git a/lib/Catalyst/Engine/HTTP/Daemon.pm b/lib/Catalyst/Engine/HTTP/Daemon.pm
index 95fa597..1e2a211 100644 (file)
--- a/lib/Catalyst/Engine/HTTP/Daemon.pm
+++ b/lib/Catalyst/Engine/HTTP/Daemon.pm
@@ -64,6 +64,7 @@ sub run {
 
             $request->uri->scheme('http');    # Force URI::http
             $request->uri->host( $base->host );
+            $request->uri->port( $base->port );
 
             my $lwp = Catalyst::Engine::Test::LWP->new(
                 request  => $request,

diff --git a/lib/Catalyst/Engine/Test.pm b/lib/Catalyst/Engine/Test.pm
index 59a6246..93e8839 100644 (file)
--- a/lib/Catalyst/Engine/Test.pm
+++ b/lib/Catalyst/Engine/Test.pm
@@ -3,7 +3,7 @@ package Catalyst::Engine::Test;
 use strict;
 use base 'Catalyst::Engine';
 
-use CGI::Simple::Cookie;
+use CGI::Cookie;
 use Class::Struct ();
 use HTTP::Headers::Util 'split_header_words';
 use HTTP::Request;
@@ -62,7 +62,7 @@ sub finalize_headers {
     my $response = HTTP::Response->new( $status, undef, $headers );
 
     while ( my ( $name, $cookie ) = each %{ $c->response->cookies } ) {
-        my $cookie = CGI::Simple::Cookie->new(
+        my $cookie = CGI::Cookie->new(
             -name    => $name,
             -value   => $cookie->{value},
             -expires => $cookie->{expires},
@@ -104,7 +104,7 @@ sub prepare_cookies {
     my $c = shift;
 
     if ( my $header = $c->request->headers->header('Cookie') ) {
-        $c->req->cookies( { CGI::Simple::Cookie->parse($header) } );
+        $c->req->cookies( { CGI::Cookie->parse($header) } );
     }
 }
 

diff --git a/lib/Catalyst/Test.pm b/lib/Catalyst/Test.pm
index fc29985..5fe2a0c 100644 (file)
--- a/lib/Catalyst/Test.pm
+++ b/lib/Catalyst/Test.pm
@@ -91,32 +91,46 @@ sub import {
     *{"$caller\::get"}     = $get;
 }
 
+my $agent;
+
 sub remote_request {
     my $request = shift;
 
     require LWP::UserAgent;
 
-    my $server = URI->new( $ENV{CATALYST_SERVER} );
-
     unless ( ref $request ) {
 
-        my $uri =
-          ( $request =~ m/http/i )
+        my $uri = ( $request =~ m/http/i )
           ? URI->new($request)
           : URI->new( 'http://localhost' . $request );
 
         $request = $uri->canonical;
     }
 
-    $request->scheme( $server->scheme );
-    $request->host( $server->host );
-    $request->port( $server->port );
-
     unless ( ref $request eq 'HTTP::Request' ) {
         $request = HTTP::Request->new( 'GET', $request );
     }
 
-    my $agent = LWP::UserAgent->new;
+    my $server = URI->new( $ENV{CATALYST_SERVER} );
+
+    if ( $server->path =~ m|^(.+)?/$| ) {
+        $server->path("$1"); # need to be quoted
+    }
+
+    $request->uri->scheme( $server->scheme );
+    $request->uri->host( $server->host );
+    $request->uri->port( $server->port );
+    $request->uri->path( $server->path . $request->uri->path );
+
+    unless ($agent) {
+        $agent = LWP::UserAgent->new(
+         #  cookie_jar   => {},
+            keep_alive   => 1,
+            max_redirect => 0,
+            timeout      => 60,
+        );
+        $agent->env_proxy;
+    }
 
     return $agent->request($request);
 }