X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FApache%2FBase.pm;h=d40f0509681f0ae73cf53f4a6a50131b89648a7f;hb=66294129a6520edc031aa7a43fc9bdfce669af15;hp=8d383da7d3005b2c76fd4d39a6bab3453531acb2;hpb=d837e1a7eadff19ff04373ad19d22fa293e19db5;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine/Apache/Base.pm b/lib/Catalyst/Engine/Apache/Base.pm index 8d383da..d40f050 100644 --- a/lib/Catalyst/Engine/Apache/Base.pm +++ b/lib/Catalyst/Engine/Apache/Base.pm @@ -75,7 +75,8 @@ sub prepare_connection { $c->request->address( $c->apache->connection->remote_ip ); $c->request->hostname( $c->apache->connection->remote_host ); $c->request->protocol( $c->apache->protocol ); - + $c->request->user( $c->apache->user ); + if ( $ENV{HTTPS} || $c->apache->get_server_port == 443 ) { $c->request->secure(1); } @@ -91,24 +92,6 @@ sub prepare_headers { $c->request->header( %{ $c->apache->headers_in } ); } -=item $c->prepare_parameters - -=cut - -sub prepare_parameters { - my $c = shift; - - my @params; - - $c->apache->param->do( sub { - my ( $field, $value ) = @_; - push( @params, $field, $value ); - return 1; - }); - - $c->request->param(@params); -} - =item $c->prepare_path =cut @@ -147,6 +130,15 @@ sub prepare_path { $c->req->path($path); } +=item $c->prepare_request($r) + +=cut + +sub prepare_request { + my ( $c, $r ) = @_; + $c->apache($r); +} + =item $c->run =cut