use strict;
use warnings;
+use Scalar::Util qw/blessed/;
use base qw/Catalyst::Request Class::Accessor::Fast/;
sub _insert_self_into {
my ($class, $app_class ) = @_;
- my $app = Catalyst::Utils::class2appclass( $app_class ) || $app_class;
+ # the fallback to $app_class is for the (rare and deprecated) case when
+ # people are defining actions in MyApp.pm instead of in a controller.
+ my $app = (blessed($app_class) && $app_class->can('_application'))
+ ? $app_class->_application : Catalyst::Utils::class2appclass( $app_class ) || $app_class;
my $req_class = $app->request_class;
return if $req_class->isa($class);
__PACKAGE__->mk_accessors(qw(data accept_only));
-=over 4
+=over 4
=item accepted_content_types
my ( $type, $qvalue ) = @{$pair}[ 0, 3 ];
next if $types{$type};
+ # cope with invalid (missing required q parameter) header like:
+ # application/json; charset="utf-8"
+ # http://tools.ietf.org/html/rfc2616#section-14.1
+ unless ( defined $pair->[2] && lc $pair->[2] eq 'q' ) {
+ $qvalue = undef;
+ }
+
unless ( defined $qvalue ) {
$qvalue = 1 - ( ++$counter / 1000 );
}