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

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index ddd742b..e604998 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -5,6 +5,9 @@ our $VERSION = '2.11';
 use strict;
 use warnings;
 
+use URI;
+use URI::QueryParam;
+
 use base 'Maypole';
 use Maypole::Headers;
 use Maypole::Constants;
@@ -15,24 +18,25 @@ our $MODPERL2;
 our $modperl_version;
 
 BEGIN {
-    eval 'use Apache;';
-    if ($@) {
-         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;
+    $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 {
-	eval ' use mod_perl; ';
-	require Apache;
-	require Apache::Request;
-	$MODPERL2 = 0;
-	$modperl_version = 1;
+     eval ' use mod_perl; ';
+     require Apache;
+     require Apache::Request;
+     eval 'use Apache::Constants -compile => qw/REDIRECT/;';
+     $modperl_version = 1;
     }
 
 }
@@ -89,7 +93,11 @@ functionality. See L<Maypole> for these:
 
 sub get_request {
     my ($self, $r) = @_;
-    my $ar = ($MODPERL2) ? $r : Apache::Request->instance($r);
+    my $ar;
+    if ($MODPERL2) {
+    	$ar = eval {require Apache2::Request} ? Apache2::Request->new($r) : $r;
+	}
+    else { $ar = Apache::Request->instance($r); }
     $self->ar($ar);
 }
 
@@ -116,7 +124,6 @@ sub parse_location {
         $path =~ s/^($loc)?\///;
     }
     $self->path($path);
-    
     $self->parse_path;
     $self->parse_args;
 }
@@ -135,12 +142,12 @@ sub parse_args {
 
 =cut
 
-# FIXME: use headers_in to gather host and other information?
-sub redirect_request 
+sub redirect_request
 {
   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}) {
@@ -154,8 +161,8 @@ sub redirect_request
     $status = $args{status} if ($args{status});
   }
 
-  $r->headers_out->set('Status' => $status);
-  $r->headers_out->set('Location' => $redirect_url);
+  $r->ar->status($status);
+  $r->ar->headers_out->set('Location' => $redirect_url);
   return OK;
 }
 
@@ -221,6 +228,23 @@ sub _mod_perl_args {
     } 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;
 }