X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=3ea2d28479dc28d49430c893ba6b7fc18765b3ae;hp=84454bc6cf3ae8c458907a2448876264261b50b7;hb=373c588aa7b5a4f0d99a5940fade8a767c6d9426;hpb=6a32fecf39ede7a47ff157f3bb73cb281a542a6a diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm index 84454bc..3ea2d28 100644 --- a/lib/Apache/MVC.pm +++ b/lib/Apache/MVC.pm @@ -1,33 +1,44 @@ package Apache::MVC; -our $VERSION = '2.10'; +our $VERSION = '2.121'; use strict; use warnings; +use URI; +use URI::QueryParam; + use base 'Maypole'; use Maypole::Headers; use Maypole::Constants; __PACKAGE__->mk_accessors( qw( ar ) ); +our $MODPERL2; +our $modperl_version; + BEGIN { - my $version; - eval 'use mod_perl2; $version = $mod_perl2::VERSION; '; - if ($@) { - use mod_perl; - $version = 0; - require Apache; - require Apache::Request; + $MODPERL2 = ( exists $ENV{MOD_PERL_API_VERSION} and + $ENV{MOD_PERL_API_VERSION} >= 2 ); + if ($MODPERL2) { + eval 'use mod_perl2; $modperl_version = $mod_perl2::VERSION;'; + if ($@) { + $modperl_version = $Apache2::RequestRec::VERSION; + } + require Apache2::RequestIO; + require Apache2::RequestRec; + require Apache2::RequestUtil; + eval 'use Apache2::Const -compile => qw/REDIRECT/;'; # -compile 4 no import + require APR::URI; + require HTTP::Body; } else { - require Apache2::RequestIO; - require Apache2::RequestRec; - require Apache2::RequestUtil; - require APR::URI; - require Apache2::Request; + eval ' use mod_perl; '; + require Apache; + require Apache::Request; + eval 'use Apache::Constants -compile => qw/REDIRECT/;'; + $modperl_version = 1; } - use constant APACHE2 => $version; } =head1 NAME @@ -82,20 +93,37 @@ functionality. See L for these: sub get_request { my ($self, $r) = @_; - my $ar = (APACHE2) ? Apache2::Request->new($r) : Apache::Request->new($r); + my $request_options = $self->config->request_options || {}; + my $ar; + if ($MODPERL2) { + $ar = eval {require Apache2::Request} ? Apache2::Request->new($r,%{$request_options}) : $r; + } else { + if (keys %$request_options) { + $ar = Apache::Request->new($r,%{$request_options}); + } else { + $ar = Apache::Request->instance($r); + } + } $self->ar($ar); } -=item get_protocol +=item warn =cut -sub get_protocol { - my $self = shift; - my $protocol = ( $self->ar->protocol =~ m/https/i ) ? 'https' : 'http' ; - return $protocol; +sub warn { + my ($self,@args) = @_; + my ($package, $line) = (caller)[0,2]; + my $ar = $self->parent ? $self->parent->{ar} : $self->{ar}; + if ( $args[0] and ref $self ) { + $ar->warn("[$package line $line] ", @args) ; + } else { + print "warn called by ", caller, " with ", @_, "\n"; + } + return; } + =item parse_location =cut @@ -105,22 +133,31 @@ sub parse_location { # Reconstruct the request headers $self->headers_in(Maypole::Headers->new); + my %headers; - if (APACHE2) { %headers = %{$self->ar->headers_in}; + if ($MODPERL2) { %headers = %{$self->ar->headers_in}; } else { %headers = $self->ar->headers_in; } for (keys %headers) { $self->headers_in->set($_, $headers{$_}); } + $self->preprocess_location(); + my $path = $self->ar->uri; - my $loc = $self->ar->location; + my $base = URI->new($self->config->uri_base); + my $loc = $base->path; + { no warnings 'uninitialized'; $path .= '/' if $path eq $loc; - $path =~ s/^($loc)?\///; + if ($loc =~ /\/$/) { + $path =~ s/^($loc)?//; + } else { + $path =~ s/^($loc)?\///; + } } + $self->path($path); - $self->parse_path; $self->parse_args; } @@ -137,32 +174,64 @@ sub parse_args { =item redirect_request +Sets output headers to redirect based on the arguments provided + +Accepts either a single argument of the full url to redirect to, or a hash of +named parameters : + +$r->redirect_request('http://www.example.com/path'); + +or + +$r->redirect_request(protocol=>'https', domain=>'www.example.com', path=>'/path/file?arguments', status=>'302', url=>'..'); + +The named parameters are protocol, domain, path, status and url + +Only 1 named parameter is required but other than url, they can be combined as +required and current values (from the request) will be used in place of any +missing arguments. The url argument must be a full url including protocol and +can only be combined with status. + =cut -# FIXME: use headers_in to gather host and other information? sub redirect_request { - my $self = shift; + my $r = shift; my $redirect_url = $_[0]; - my $status = "302"; + my $status = $MODPERL2 ? eval 'Apache2::Const::REDIRECT;' : + eval 'Apache::Constants::REDIRECT;'; # why have to eval this? if ($_[1]) { my %args = @_; if ($args{url}) { $redirect_url = $args{url}; } else { - my $path = $args{path} || $self->path; - my $host = $args{domain} || $self->ar->hostname; - my $protocol = $args{protocol} || - ( $self->ar->protocol =~ m/https/i ) ? 'https' : 'http' ; - $redirect_url = "${protocol}://${host}/${path}"; + my $path = $args{path} || $r->path; + my $host = $args{domain} || $r->ar->hostname; + my $protocol = $args{protocol} || $r->get_protocol; + + $redirect_url = URI->new; + $redirect_url->scheme($protocol); + $redirect_url->host($host); + $redirect_url->path($path); } $status = $args{status} if ($args{status}); } - $self->headers_out->set('Status' => $status); - $self->headers_out->set('Location' => $redirect_url); + $r->ar->status($status); + $r->ar->headers_out->set('Location' => $redirect_url); return OK; } + +=item get_protocol + +=cut + +sub get_protocol { + my $self = shift; + my $protocol = ( $self->ar->protocol =~ m/https/i ) ? 'https' : 'http' ; + return $protocol; +} + =item send_output =cut @@ -183,7 +252,7 @@ sub send_output { $r->ar->headers_out->set($_ => $r->headers_out->get($_)); } - APACHE2 || $r->ar->send_http_header; + $MODPERL2 || $r->ar->send_http_header; $r->ar->print( $r->output ); } @@ -196,23 +265,73 @@ sub get_template_root { $r->ar->document_root . "/" . $r->ar->location; } +=back + +=cut + +######################################################### +# private / internal methods and subs + + sub _mod_perl_args { my ( $self, $apr ) = @_; my %args; - foreach my $key ( $apr->param ) { + if ($apr->isa('Apache::Request')) { + foreach my $key ( $apr->param ) { my @values = $apr->param($key); $args{$key} = @values == 1 ? $values[0] : \@values; + } + } else { + my $body = $self->_prepare_body($apr); + %args = %{$body->param}; + my $uri = URI->new($self->ar->unparsed_uri); + foreach my $key ($uri->query_param) { + if (ref $args{$key}) { + push (@{$args{$key}}, $uri->query_param($key)); + } else { + if ($args{$key}) { + $args{$key} = [ $args{$key}, $uri->query_param($key) ]; + } else { + my @args = $uri->query_param($key); + if (scalar @args > 1) { + $args{$key} = [ $uri->query_param($key) ]; + } else { + $args{$key} = $uri->query_param($key); + } + } + } + } } return %args; } -1; +sub _prepare_body { + my ( $self, $r ) = @_; + + unless ($self->{__http_body}) { + my $content_type = $r->headers_in->get('Content-Type'); + my $content_length = $r->headers_in->get('Content-Length'); + my $body = HTTP::Body->new( $content_type, $content_length ); + my $length = $content_length; + while ( $length ) { + $r->read( my $buffer, ( $length < 8192 ) ? $length : 8192 ); + $length -= length($buffer); + $body->add($buffer); + } + $self->{__http_body} = $body; + } + return $self->{__http_body}; +} + -=back =head1 AUTHOR Simon Cozens, C + +=head1 CREDITS + +Aaron Trevena Marcus Ramberg, C Sebastian Riedel, C @@ -221,3 +340,5 @@ Sebastian Riedel, C You may distribute this code under the same terms as Perl itself. =cut + +1;