Changeset 10393 for lang/perl/HTTPEx-Adaptor-ModPerl

Timestamp:

04/25/08 09:42:57 (5 years ago)

Author:

daisuke

Message:

configはどこにいくんでしょうね。とりあえず動くようにしてみた

Files:

• lang/perl/HTTPEx-Adaptor-ModPerl/trunk/lib/HTTPEx/Adaptor/ModPerl.pm (modified) (8 diffs)

lang/perl/HTTPEx-Adaptor-ModPerl/trunk/lib/HTTPEx/Adaptor/ModPerl.pm

@@ -11 +11 @@
 use URI::https;
 
+use Apache2::Connection;
+use Apache2::RequestRec;
+use Apache2::RequestUtil;
+use APR::Table;
+
 use constant MP2 => (
     exists $ENV{MOD_PERL_API_VERSION} and
@@ -62 +67 @@
     my ( $self, $adaptor, $c ) = @_;
 
-    $c->request->address( $self->apache->connection->remote_ip );
+    my $apache = $self->apache;
+    my $config = $self->config;
+
+    $c->request->address( $apache->connection->remote_ip );
 
     PROXY_CHECK:
     {
-        my $headers = $self->apache->headers_in;
-        unless ( $c->config->{using_frontend_proxy} ) {
+        my $headers = $apache->headers_in;
+        unless ( $config->{using_frontend_proxy} ) {
             last PROXY_CHECK if $c->request->address ne '127.0.0.1';
-            last PROXY_CHECK if $c->config->{ignore_frontend_proxy};
+            last PROXY_CHECK if $config->{ignore_frontend_proxy};
         }        
         last PROXY_CHECK unless $headers->{'X-Forwarded-For'};
@@ -87 +95 @@
         $c->request->secure(1) if $self->apache->connection->is_https;
     } else {
-        my $https = $self->apache->subprocess_env('HTTPS'); 
+        my $https = $apache->subprocess_env('HTTPS'); 
         $c->request->secure(1) if defined $https and uc $https eq 'ON';
     }
@@ -115 +123 @@
     my ( $self, $adaptor, $c ) = @_;
 
+    my $apache = $self->apache;
+    my $config = $self->config;
+
     my $scheme = $c->request->secure ? 'https' : 'http';
-    my $host   = $self->apache->hostname || 'localhost';
-    my $port   = $self->apache->get_server_port;
+    my $host   = $apache->hostname || 'localhost';
+    my $port   = $apache->get_server_port;
 
     # If we are running as a backend proxy, get the true hostname
     PROXY_CHECK:
     {
-        unless ( $c->config->{using_frontend_proxy} ) {
+        unless ( $config->{using_frontend_proxy} ) {
             last PROXY_CHECK if $host !~ /localhost|127.0.0.1/;
-            last PROXY_CHECK if $c->config->{ignore_frontend_proxy};
+            last PROXY_CHECK if $config->{ignore_frontend_proxy};
         }
         last PROXY_CHECK unless $c->request->header( 'X-Forwarded-Host' );
@@ -143 +154 @@
 
     # Are we running in a non-root Location block?
-    my $location = $self->apache->location;
+    my $location = $apache->location;
     if ( $location && $location ne '/' ) {
         $base_path = $location;
@@ -161 +172 @@
     
     if ( MP2 ) {
-        ($path, $qs) = split /\?/, $self->apache->unparsed_uri, 2;
+        ($path, $qs) = split /\?/, $apache->unparsed_uri, 2;
     }
     else {
-        my (undef, $path_query) = split / /, $self->apache->the_request, 3;
+        my (undef, $path_query) = split / /, $apache->the_request, 3;
         ($path, $qs)            = split /\?/, $path_query, 2;
     }
@@ -170 +181 @@
     # Don't check for LocationMatch blocks if requested
     # http://rt.cpan.org/Ticket/Display.html?id=26921
-    if ( $self->apache->dir_config('CatalystDisableLocationMatch') ) {
+    if ( $apache->dir_config('HTTPEngineDisableLocationMatch') ) {
         $base_path = '';
     }
@@ -194 +205 @@
     # this way is beyond me, but we'll support it!
     # XXX: This needs a test
-    if ( defined $ENV{SCRIPT_NAME} && $self->apache->filename && -f $self->apache->filename && -x _ ) {
+    if ( defined $ENV{SCRIPT_NAME} && $apache->filename && -f $apache->filename && -x _ ) {
         $base_path .= $ENV{SCRIPT_NAME};
     }