X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=ddd742b2065be219de5330e959e27d8e150a5f53;hb=41a93152a01bdeab5ada42fd423f985554ade78e;hp=84454bc6cf3ae8c458907a2448876264261b50b7;hpb=6a32fecf39ede7a47ff157f3bb73cb281a542a6a;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 84454bc..ddd742b 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,6 +1,6 @@
 package Apache::MVC;
 
-our $VERSION = '2.10';
+our $VERSION = '2.11';
 
 use strict;
 use warnings;
@@ -11,23 +11,30 @@ use Maypole::Constants;
 
 __PACKAGE__->mk_accessors( qw( ar ) );
 
+our $MODPERL2;
+our $modperl_version;
+
 BEGIN {
-    my $version;
-    eval 'use mod_perl2; $version = $mod_perl2::VERSION; ';
+    eval 'use Apache;';
     if ($@) {
-	use mod_perl;
-	$version = 0;
+         eval 'use mod_perl2; $modperl_version = $mod_perl2::VERSION; ';
+         if ($@) {
+	   $modperl_version = $Apache2::RequestRec::VERSION;
+         }
+	 require Apache2::RequestIO;
+	 require Apache2::RequestRec;
+	 require Apache2::RequestUtil;
+	 require APR::URI;
+	 require HTTP::Body;
+	 $MODPERL2 = 1;
+    } else {
+	eval ' use mod_perl; ';
 	require Apache;
 	require Apache::Request;
-    } else {
-	require Apache2::RequestIO;
-	require Apache2::RequestRec;
-	require Apache2::RequestUtil;
-	require APR::URI;
-	require Apache2::Request;
+	$MODPERL2 = 0;
+	$modperl_version = 1;
     }
 
-    use constant APACHE2 => $version;
 }
 
 =head1 NAME
@@ -82,20 +89,10 @@ functionality. See L<Maypole> for these:
 
 sub get_request {
     my ($self, $r) = @_;
-    my $ar = (APACHE2) ? Apache2::Request->new($r) : Apache::Request->new($r);
+    my $ar = ($MODPERL2) ? $r : Apache::Request->instance($r);
     $self->ar($ar);
 }
 
-=item get_protocol
-
-=cut
-
-sub get_protocol {
-  my $self = shift;
-  my $protocol = ( $self->ar->protocol =~ m/https/i ) ? 'https' : 'http' ;
-  return $protocol;
-}
-
 =item parse_location
 
 =cut
@@ -106,12 +103,11 @@ 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{$_});
     }
-
     my $path = $self->ar->uri;
     my $loc  = $self->ar->location;
     {
@@ -140,8 +136,9 @@ sub parse_args {
 =cut
 
 # FIXME: use headers_in to gather host and other information?
-sub redirect_request {
-  my $self = shift;
+sub redirect_request 
+{
+  my $r = shift;
   my $redirect_url = $_[0];
   my $status = "302";
   if ($_[1]) {
@@ -149,20 +146,29 @@ sub redirect_request {
     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' ;
+      my $path = $args{path} || $r->path;
+      my $host = $args{domain} || $r->ar->hostname;
+      my $protocol = $args{protocol} || $r->get_protocol;
       $redirect_url = "${protocol}://${host}/${path}";
     }
     $status = $args{status} if ($args{status});
   }
 
-  $self->headers_out->set('Status' => $status);
-  $self->headers_out->set('Location' => $redirect_url);
+  $r->headers_out->set('Status' => $status);
+  $r->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 +189,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 +202,56 @@ 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};
     }
     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<simon@cpan.org>
+
+=head1 CREDITS
+
+Aaron Trevena
 Marcus Ramberg, C<marcus@thefeed.no>
 Sebastian Riedel, C<sri@oook.de>
 
@@ -221,3 +260,5 @@ Sebastian Riedel, C<sri@oook.de>
 You may distribute this code under the same terms as Perl itself.
 
 =cut
+
+1;