[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mason-cvs
Subject:    [Mason-checkins] CVS: mason/dist/inc/Mason Build.pm,1.25,1.26
From:       John Williams <sharkey3 () users ! sourceforge ! net>
Date:       2005-05-29 1:52:07
Message-ID: E1DcCyF-0004tv-Il () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/mason/mason/dist/inc/Mason
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18401/inc/Mason

Modified Files:
	Build.pm 
Log Message:
mod_perl2 renaming changes


Index: Build.pm
===================================================================
RCS file: /cvsroot/mason/mason/dist/inc/Mason/Build.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Build.pm	31 Jan 2005 07:19:22 -0000	1.25
+++ Build.pm	29 May 2005 01:52:05 -0000	1.26
@@ -165,7 +165,11 @@
         File::Spec->catfile( $conf{apache_dir}, 'mason_handler_CGI.pl' );
     my $mod_perl_handler =
         File::Spec->catfile( $conf{apache_dir}, 'mason_handler_mod_perl.pl' );
-    my $default_args_method = (Apache::test::have_module('Apache::Request') ? 'mod_perl' : 'CGI');
+    my $apreq_module = $conf{version} =~ m/^2\./ ? 'Apache2::Request' : 'Apache::Request';
+    # Apache::test::have_module often stderrs about not finding libapreq.so
+    # Putting SERVER_ROOT/lib in LD_LIBRARY_PATH would suppress that, but
+    # that would have to be done before perl starts running.
+    my $default_args_method = (Apache::test::have_module($apreq_module) ? 'mod_perl' : 'CGI');
 
     my %multiconf;
     $multiconf{1}{comp_root} = File::Spec->catfile( $conf{comp_root}, 'multiconf1' );
@@ -391,7 +395,7 @@
       || \$self->delayed_object_params('request', 'apache_req')
       || \$self->delayed_object_params('request', 'cgi_request');
     \$r->content_type( 'text/fooml' );
-    \$r->send_http_header unless \$mod_perl::VERSION >= 1.99;
+    \$r->send_http_header unless \$mod_perl2::VERSION >= 2.00;
     HTML::Mason::Exception::Abort->throw(error => 'foo', aborted_value => 200);
 }
 



-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Mason-checkins mailing list
Mason-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mason-checkins
[prev in list] [next in list] [prev in thread] [next in thread]