sub prepare_connection {
my $c = shift;
- $c->req->hostname( $ENV{REMOTE_HOST} );
- $c->req->address( $ENV{REMOTE_ADDR} );
+ $c->request->address( $ENV{REMOTE_ADDR} );
+ $c->request->hostname( $ENV{REMOTE_HOST} );
+ $c->request->protocol( $ENV{SERVER_PROTOCOL} );
+
+ if ( $ENV{HTTPS} || $ENV{SERVER_PORT} == 443 ) {
+ $c->request->secure(1);
+ }
}
=item $c->prepare_headers
sub prepare_parameters {
my $c = shift;
-
+
my ( @params );
-
+
if ( $c->request->method eq 'POST' ) {
for my $param ( $c->cgi->url_param ) {
for my $value ( $c->cgi->url_param($param) ) {
}
}
- for my $param ( $c->cgi->param ) {
+ for my $param ( $c->cgi->param ) {
for my $value ( $c->cgi->param($param) ) {
push ( @params, $param, $value );
}
}
-
- $c->request->param(\@params);
+
+ $c->request->param(@params);
}
=item $c->prepare_path
my $base;
{
- my $scheme = $ENV{HTTPS} ? 'https' : 'http';
+ my $scheme = $c->request->secure ? 'https' : 'http';
my $host = $ENV{HTTP_HOST} || $ENV{SERVER_NAME};
my $port = $ENV{SERVER_PORT} || 80;
my $path = $ENV{SCRIPT_NAME} || '/';
=cut
-sub prepare_request {
+sub prepare_request {
my ( $c, $cgi ) = @_;
$c->cgi( $cgi || CGI->new );
$c->cgi->_reset_globals;
my $c = shift;
my @uploads;
-
+
for my $param ( $c->cgi->param ) {
-
+
my @values = $c->cgi->param($param);
next unless ref( $values[0] );
tempname => $tempname,
type => $type
);
-
+
push( @uploads, $param, $upload );
}
}
-
- $c->request->upload(\@uploads);
+
+ $c->request->upload(@uploads);
}
=item $c->run
sub prepare_connection {
my $c = shift;
- $c->req->hostname( $c->http->hostname );
- $c->req->address( $c->http->address );
+ $c->request->address( $c->http->address );
+ $c->request->hostname( $c->http->hostname );
+ $c->request->protocol( $c->http->request->protocol );
}
=item $c->prepare_headers
sub prepare_headers {
my $c = shift;
- $c->req->method( $c->http->request->method );
- $c->req->headers( $c->http->request->headers );
+ $c->request->method( $c->http->request->method );
+ $c->request->headers( $c->http->request->headers );
}
=item $c->prepare_parameters
}
}
- $c->req->_assign_values( $c->req->parameters, \@params );
- $c->req->_assign_values( $c->req->uploads, \@uploads );
+ $c->request->param(@params);
+ $c->request->upload(@uploads);
}
=item $c->prepare_path
__PACKAGE__->mk_accessors(
qw/action address arguments body base cookies headers hostname match
- method parameters path snippets uploads/
+ method parameters path protocol secure snippets uploads/
);
*args = \&arguments;
sub referer { shift->headers->referer(@_) }
sub user_agent { shift->headers->user_agent(@_) }
-sub _assign_values {
- my ( $self, $map, $values ) = @_;
-
- while ( my ( $name, $value ) = splice( @{$values}, 0, 2 ) ) {
-
- if ( exists $map->{$name} ) {
- for ( $map->{$name} ) {
- $_ = [$_] unless ref($_) eq "ARRAY";
- push( @$_, $value );
- }
- }
- else {
- $map->{$name} = $value;
- }
- }
-}
-
=head1 NAME
Catalyst::Request - Catalyst Request Class
$req->params;
$req->parameters;
$req->path;
+ $req->protocol;
$req->referer;
+ $req->secure;
$req->snippets;
$req->upload;
$req->uploads;
return keys %{ $self->parameters };
}
- my $param = shift;
+ if ( @_ == 1 ) {
- unless ( exists $self->parameters->{$param} ) {
- return wantarray ? () : undef;
- }
+ my $param = shift;
- if ( ref $self->parameters->{$param} eq 'ARRAY' ) {
- return (wantarray)
- ? @{ $self->parameters->{$param} }
- : $self->parameters->{$param}->[0];
+ unless ( exists $self->parameters->{$param} ) {
+ return wantarray ? () : undef;
+ }
+
+ if ( ref $self->parameters->{$param} eq 'ARRAY' ) {
+ return (wantarray)
+ ? @{ $self->parameters->{$param} }
+ : $self->parameters->{$param}->[0];
+ }
+ else {
+ return (wantarray)
+ ? ( $self->parameters->{$param} )
+ : $self->parameters->{$param};
+ }
}
- else {
- return (wantarray)
- ? ( $self->parameters->{$param} )
- : $self->parameters->{$param};
+
+ if ( @_ => 2 ) {
+
+ while ( my ( $field, $value ) = splice( @_, 0, 2 ) ) {
+
+ if ( exists $self->parameters->{$field} ) {
+ for ( $self->parameters->{$field} ) {
+ $_ = [$_] unless ref($_) eq "ARRAY";
+ push( @$_, $value );
+ }
+ }
+ else {
+ $self->parameters->{$field} = $value;
+ }
+ }
}
}
print $c->request->path;
+=item $req->protocol
+
+Contains the protocol.
+
=item $req->referer
Shortcut to $req->headers->referer. Referring page.
+=item $req->secure
+
+Contains a boolean whether the communciation is secure.
+
=item $req->snippets
Returns a reference to an array containing regex snippets.
$upload = $c->request->upload('field');
@uploads = $c->request->upload('field');
@fields = $c->request->upload;
-
+
for my $upload ( $c->request->upload('field') ) {
print $upload->filename;
}
return keys %{ $self->uploads };
}
- my $upload = shift;
+ if ( @_ == 1 ) {
- unless ( exists $self->uploads->{$upload} ) {
- return wantarray ? () : undef;
- }
+ my $upload = shift;
+
+ unless ( exists $self->uploads->{$upload} ) {
+ return wantarray ? () : undef;
+ }
- if ( ref $self->uploads->{$upload} eq 'ARRAY' ) {
- return (wantarray)
- ? @{ $self->uploads->{$upload} }
- : $self->uploads->{$upload}->[0];
+ if ( ref $self->uploads->{$upload} eq 'ARRAY' ) {
+ return (wantarray)
+ ? @{ $self->uploads->{$upload} }
+ : $self->uploads->{$upload}->[0];
+ }
+ else {
+ return (wantarray)
+ ? ( $self->uploads->{$upload} )
+ : $self->uploads->{$upload};
+ }
}
- else {
- return (wantarray)
- ? ( $self->uploads->{$upload} )
- : $self->uploads->{$upload};
+
+ if ( @_ => 2 ) {
+
+ while ( my ( $field, $upload ) = splice( @_, 0, 2 ) ) {
+
+ if ( exists $self->uploads->{$field} ) {
+ for ( $self->uploads->{$field} ) {
+ $_ = [$_] unless ref($_) eq "ARRAY";
+ push( @$_, $upload );
+ }
+ }
+ else {
+ $self->uploads->{$field} = $upload;
+ }
+ }
}
}
=item $req->uploads
-Returns a reference to a hash containing uploads. Values can be either a
+Returns a reference to a hash containing uploads. Values can be either a
hashref or a arrayref containing C<Catalyst::Request::Upload> objects.
my $upload = $c->request->uploads->{field};