with 'MooseX::Emulate::Class::Accessor::Fast';
-has env => (is => 'ro', writer => '_set_env', predicate => 'has_env');
+has env => (is => 'ro', writer => '_set_env', predicate => '_has_env');
# XXX Deprecated crap here - warn?
has action => (is => 'rw');
# XXX: Deprecated in docs ages ago (2006), deprecated with warning in 5.8000 due
has match => (is => 'rw');
has method => (is => 'rw');
has protocol => (is => 'rw');
-has query_parameters => (is => 'rw', default => sub { {} });
+has query_parameters => (is => 'rw', lazy=>1, default => sub { shift->_use_hash_multivalue ? Hash::MultiValue->new : +{} });
has secure => (is => 'rw', default => 0);
has captures => (is => 'rw', default => sub { [] });
has uri => (is => 'rw', predicate => 'has_uri');
has io_fh => (
is=>'ro',
- predicate=>'has_io_fh',
+ predicate=>'_has_io_fh',
lazy=>1,
builder=>'_build_io_fh');
}
}
+has _use_hash_multivalue => (
+ is=>'ro',
+ required=>1,
+ default=> sub {0});
+
# Amount of data to read from input on each pass
our $CHUNKSIZE = 64 * 1024;
my $body_parameters = $self->body_parameters;
my $query_parameters = $self->query_parameters;
- ## setup for downstream plack
- $self->env->{'plack.request.merged'} ||= do {
- my $query = $self->env->{'plack.request.query'} || Hash::MultiValue->new;
- my $body = $self->env->{'plack.request.body'} || Hash::MultiValue->new;
- Hash::MultiValue->new($query->flatten, $body->flatten);
- };
+ if($self->_use_hash_multivalue) {
+ return Hash::MultiValue->new($query_parameters->flatten, $body_parameters->flatten);
+ }
# We copy, no references
foreach my $name (keys %$query_parameters) {
# If previously applied middleware created the HTTP::Body object, then we
# just use that one.
- if(my $plack_body = $self->env->{'plack.request.http.body'}) {
+ if(my $plack_body = $self->_has_env ? $self->env->{'plack.request.http.body'} : undef) {
$self->_body($plack_body);
$self->_body->cleanup(1);
return;
}
- # Define PSGI ENV placeholders, or for empty should there be no content
- # body (typical in HEAD or GET). Looks like from Plack::Request that
- # middleware would probably expect to see this, even if empty
-
- $self->env->{'plack.request.body'} = Hash::MultiValue->new;
- $self->env->{'plack.request.upload'} = Hash::MultiValue->new;
-
# If there is nothing to read, set body to naught and return. This
# will cause all body code to be skipped
$self->env->{'psgi.input'}->seek(0, 0); # Reset the buffer for downstream middleware or apps
}
- $self->env->{'plack.request.http.body'} = $self->_body;
- $self->env->{'plack.request.body'} = Hash::MultiValue->from_mixed($self->_body->param);
-
# paranoia against wrong Content-Length header
my $remaining = $length - $self->_read_position;
if ( $remaining > 0 ) {
my ( $self ) = @_;
$self->prepare_body if ! $self->_has_body;
- return {} unless $self->_body;
- return $self->_body->param;
+ unless($self->_body) {
+ return $self->_use_hash_multivalue ? Hash::MultiValue->new : {};
+ }
+
+ return $self->_use_hash_multivalue ?
+ Hash::MultiValue->from_mixed($self->_body->param) :
+ $self->_body->param;
}
sub prepare_connection {