X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=b959d7ccdaee03edd8d51309b74ca2e110bdaefb;hp=ea5507d7be1ef17d86751d9e5056ca113ed64065;hb=0df490ef10f0a2deaa3b7950e721fa44659de860;hpb=f0580bff341c3d9a8a62bb8e670ff8772745786f diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index ea5507d..b959d7c 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -52,20 +52,30 @@ has request => ( is => 'rw', default => sub { my $self = shift; - my %p = ( _log => $self->log ); - $p{_uploadtmp} = $self->_uploadtmp if $self->_has_uploadtmp; - $self->request_class->new(\%p); + $self->request_class->new($self->_build_request_class_construction_parameters); }, lazy => 1, ); +sub _build_request_class_construction_parameters { + my $self = shift; + my %p = ( _log => $self->log ); + $p{_uploadtmp} = $self->_uploadtmp if $self->_has_uploadtmp; + \%p; +} + has response => ( is => 'rw', default => sub { my $self = shift; - $self->response_class->new({ _log => $self->log }); + $self->response_class->new($self->_build_response_class_construction_parameters); }, lazy => 1, ); +sub _build_response_class_construction_parameters { + my $self = shift; + { _log => $self->log }; +} + has namespace => (is => 'rw'); sub depth { scalar @{ shift->stack || [] }; }