X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=6c2ecb54ce4476cff3974745f0a516c389d28f6a;hb=cbb931057eb985308705c7b29aca87600b99ecd4;hp=456497f89404ccee0461e1aa7c4090c4e2e4f199;hpb=0ef447d8c6880fa4dda2648aa19a005245ef036a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index 456497f..6c2ecb5 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -7,6 +7,7 @@ use HTTP::Request; use Path::Class; use URI; use Class::Inspector; +use Carp qw/croak/; =head1 NAME @@ -220,10 +221,10 @@ sub request { my $request = shift; unless ( ref $request ) { if ( $request =~ m/^http/i ) { - $request = URI->new($request)->canonical; + $request = URI->new($request); } else { - $request = URI->new( 'http://localhost' . $request )->canonical; + $request = URI->new( 'http://localhost' . $request ); } } unless ( ref $request eq 'HTTP::Request' ) { @@ -242,6 +243,9 @@ sub ensure_class_loaded { my $class = shift; my $opts = shift; + croak "Malformed class Name $class" + if $class =~ m/(?:\b\:\b|\:{3,})/; + return if !$opts->{ ignore_loaded } && Class::Inspector->loaded( $class ); # if a symbol entry exists we don't load again