fixed base for apache

diff --git a/Changes b/Changes
index b956955..204a7cc 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 This file documents the revision history for Perl extension Catalyst.
+
 4.24  Xxx Mar 00 00:00:00 2005
         - updated cookbook example  
+        - fixed base for apache (Andrew Ruthven)
         
 4.23  Wed Mar 09 20:00:00 2005
         - no more regex actions in forward

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 5349cb2..07c21f3 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -7,7 +7,7 @@ use Catalyst::Log;
 
 __PACKAGE__->mk_classdata($_) for qw/_config log/;
 
-our $VERSION = '4.23';
+our $VERSION = '4.24';
 our @ISA;
 
 =head1 NAME
@@ -32,9 +32,6 @@ Catalyst - The Elegant MVC Web Application Framework
     script/test.pl /yada
 
 
-    See also L<Catalyst::Manual::Intro>
-
-
     use Catalyst;
 
     use Catalyst qw/My::Module My::OtherModule/;
@@ -61,6 +58,8 @@ Catalyst - The Elegant MVC Web Application Framework
         }
     );
 
+See also L<Catalyst::Manual::Intro>
+
 =head1 DESCRIPTION
 
 Catalyst is based upon L<Maypole>, which you should consider for smaller
@@ -198,8 +197,9 @@ Sebastian Riedel, C<sri@oook.de>
 
 =head1 THANK YOU
 
-Danijel Milicevic, David Naughton, Gary Ashton Jones, Jesse Sheidlower,
-Johan Lindstrom, Marcus Ramberg and all the others who've helped.
+Andrew Ruthven, Danijel Milicevic, David Naughton, Gary Ashton Jones,
+Jesse Sheidlower, Johan Lindstrom, Marcus Ramberg and all the others
+who've helped.
 
 =head1 LICENSE
 

diff --git a/lib/Catalyst/Engine/Apache.pm b/lib/Catalyst/Engine/Apache.pm
index 0bba6ad..94dacf1 100644 (file)
--- a/lib/Catalyst/Engine/Apache.pm
+++ b/lib/Catalyst/Engine/Apache.pm
@@ -140,7 +140,8 @@ sub prepare_path {
     $base->scheme( $c->apache_request->protocol =~ /HTTPS/ ? 'https' : 'http' );
     $base->host( $c->apache_request->hostname );
     $base->port( $c->apache_request->get_server_port );
-    $base->path( $c->apache_request->location );
+    my $path = $c->apache_request->location;
+    $base->path( $path =~ /\/$/ ? $path : "$path/" );
     $c->req->base( $base->as_string );
 }