[Rt-commit] r3805 - in rt/branches/3.5-TESTING: . bin lib/RT/Interface/Web

[jesse at bestpractical.com]

Author: jesse
Date: Fri Sep  2 12:41:09 2005
New Revision: 3805

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/README
   rt/branches/3.5-TESTING/bin/webmux.pl.in
   rt/branches/3.5-TESTING/lib/RT/Interface/Web/Handler.pm
Log:
 r13748 at hualien:  jesse | 2005-08-24 16:19:08 -0400
  r13725 at hualien:  jesse | 2005-08-23 22:10:42 -0400
  * Added support for mod_perl 2.0 
 


Modified: rt/branches/3.5-TESTING/README
==============================================================================
--- rt/branches/3.5-TESTING/README	(original)
+++ rt/branches/3.5-TESTING/README	Fri Sep  2 12:41:09 2005
@@ -35,9 +35,6 @@
         with mod_perl -- (http://perl.apache.org ) 
         or a webserver with FastCGI support (www.fastcgi.com)
 
-        mod_perl 2.0 isn't quite ready for prime_time just yet;
-        We _strongly_ recommend that you use Apache 1.3 or FastCGI.
-
         Compiling mod_perl on Apache 1.3.x as a DSO has been known 
         to have massive stability problems and is not recommended.
 

Modified: rt/branches/3.5-TESTING/bin/webmux.pl.in
==============================================================================
--- rt/branches/3.5-TESTING/bin/webmux.pl.in	(original)
+++ rt/branches/3.5-TESTING/bin/webmux.pl.in	Fri Sep  2 12:41:09 2005
@@ -56,13 +56,9 @@
     use CGI qw(-private_tempfiles);    #bring this in before mason, to make sure we
                                    #set private_tempfiles
 
-    if ($ENV{MOD_PERL} =~ m{mod_perl/1\.9}) {
-        die "ModPerl 1.9x is no longer supported -- upgrade to 2.0 first";
-    }
-    if ($ENV{MOD_PERL} =~ m{mod_perl/2}) {
-        require mod_perl2;
-        require Apache2::RequestUtil;
-    }
+    die "RT does not support mod_perl 1.99. Please upgrade to mod_perl 2.0"
+      if $ENV{'MOD_PERL'}
+      and $ENV{'MOD_PERL'} =~ m{mod_perl/(?:1\.9)};
 
 }
 

Modified: rt/branches/3.5-TESTING/lib/RT/Interface/Web/Handler.pm
==============================================================================
--- rt/branches/3.5-TESTING/lib/RT/Interface/Web/Handler.pm	(original)
+++ rt/branches/3.5-TESTING/lib/RT/Interface/Web/Handler.pm	Fri Sep  2 12:41:09 2005
@@ -87,19 +87,7 @@
     my $class = shift;
     $class->InitSessionDir;
 
-    if ($MasonX::Apache2Handler::VERSION) {
-        goto &NewApache2Handler;
-    }
-    elsif ( $mod_perl::VERSION && $mod_perl::VERSION >= 2 ) {
-        no warnings 'redefine';
-        my $sub = *Apache::request{CODE};
-        *Apache::request = sub {
-            my $r;
-            eval { $r = $sub->('Apache'); };
-
-            # warn $@ if $@;
-            return $r;
-        };
+    if ( $mod_perl::VERSION && $mod_perl::VERSION >= 1.9908 ) {
         goto &NewApacheHandler;
     }
     elsif ($CGI::MOD_PERL) {