X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=c2e925b2738c63915cbfe5c1388b9f9bb77edca1;hb=f9451270ac09ec79f7185213288c927501010d1f;hp=b959d7ccdaee03edd8d51309b74ca2e110bdaefb;hpb=0df490ef10f0a2deaa3b7950e721fa44659de860;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index b959d7c..c2e925b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -23,6 +23,7 @@ use Path::Class::File ();
use URI ();
use URI::http;
use URI::https;
+use HTML::Entities;
use Tree::Simple qw/use_weak_refs/;
use Tree::Simple::Visitor::FindByUID;
use Class::C3::Adopt::NEXT;
@@ -52,11 +53,11 @@ has request => (
is => 'rw',
default => sub {
my $self = shift;
- $self->request_class->new($self->_build_request_class_construction_parameters);
+ $self->request_class->new($self->_build_request_constructor_args);
},
lazy => 1,
);
-sub _build_request_class_construction_parameters {
+sub _build_request_constructor_args {
my $self = shift;
my %p = ( _log => $self->log );
$p{_uploadtmp} = $self->_uploadtmp if $self->_has_uploadtmp;
@@ -67,11 +68,11 @@ has response => (
is => 'rw',
default => sub {
my $self = shift;
- $self->response_class->new($self->_build_response_class_construction_parameters);
+ $self->response_class->new($self->_build_response_constructor_args);
},
lazy => 1,
);
-sub _build_response_class_construction_parameters {
+sub _build_response_constructor_args {
my $self = shift;
{ _log => $self->log };
}
@@ -112,7 +113,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.90016';
+our $VERSION = '5.90020';
sub import {
my ( $class, @arguments ) = @_;
@@ -1340,10 +1341,14 @@ sub uri_for {
# join args with '/', or a blank string
my $args = join('/', grep { defined($_) } @args);
$args =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE
- $args =~ s!^/+!!;
- my $base = $c->req->base;
- my $class = ref($base);
- $base =~ s{(?req->base;
+ $class = ref($base);
+ $base =~ s{(?has_body ) {
# Add a default body if none is already present
+ my $encoded_location = encode_entities($location);
$response->body(<<"EOF");
@@ -1876,7 +1882,7 @@ sub finalize_headers {
Moved
- This item has moved here.
+ This item has moved here.