X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=3ea2d28479dc28d49430c893ba6b7fc18765b3ae;hp=a79c6113f2f4a7932cb511929ed5c354adafc1de;hb=373c588aa7b5a4f0d99a5940fade8a767c6d9426;hpb=50801f50404838954238fb4a87d4df5dda50cd76 diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm index a79c611..3ea2d28 100644 --- a/lib/Apache/MVC.pm +++ b/lib/Apache/MVC.pm @@ -1,6 +1,6 @@ package Apache::MVC; -our $VERSION = '2.12'; +our $VERSION = '2.121'; use strict; use warnings; @@ -96,9 +96,14 @@ sub get_request { my $request_options = $self->config->request_options || {}; my $ar; if ($MODPERL2) { - $ar = eval {require Apache2::Request} ? Apache2::Request->new($r,%{$request_options}) : $r; - } - else { $ar = Apache::Request->instance($r,%{$request_options}); } + $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); }