This commit was generated by cvs2svn to compensate for changes in r6255,

which included commits to RCS files with non-trunk default branches.

1 files changed, 6 insertions, 17 deletions

diff --git a/rt/lib/RT/Interface/Web/Handler.pm b/rt/lib/RT/Interface/Web/Handler.pm
index e41490f8f..1e871ec59 100644
--- a/rt/lib/RT/Interface/Web/Handler.pm
+++ b/rt/lib/RT/Interface/Web/Handler.pm
@@ -2,7 +2,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
 #                                          <jesse@bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/copyleft/gpl.html.
 # 
 # 
 # CONTRIBUTION SUBMISSION POLICY:
@@ -43,7 +45,6 @@
 # those contributions and any derivatives thereof.
 # 
 # END BPS TAGGED BLOCK }}}
-
 package RT::Interface::Web::Handler;
 
 use CGI qw/-private_tempfiles/;
@@ -54,7 +55,6 @@ use Time::ParseDate;
 use Time::HiRes;
 use HTML::Entities;
 use HTML::Scrubber;
-use Text::Quoted;
 use RT::Interface::Web::Handler;
 use File::Path qw( rmtree );
 use File::Glob qw( bsd_glob );
@@ -88,16 +88,6 @@ sub new {
     $class->InitSessionDir;
 
     if ( $mod_perl::VERSION && $mod_perl::VERSION >= 1.9908 ) {
-#        require Apache::RequestUtil;
-#        no warnings 'redefine';
-#        my $sub = *Apache::request{CODE};
-#        *Apache::request = sub {
-#            my $r;
-#            eval { $r = $sub->('Apache'); };
-#
-#            # warn $@ if $@;
-#            return $r;
-#        };
         goto &NewApacheHandler;
     }
     elsif ($CGI::MOD_PERL) {
@@ -117,12 +107,11 @@ sub InitSessionDir {
         # Clean up our umask to protect session files
         umask(0077);
 
-        if ($CGI::MOD_PERL and $CGI::MOD_PERL < 1.9908 ) {
+        if ($CGI::MOD_PERL) { local $@; eval {
 
             chown( Apache->server->uid, Apache->server->gid,
                 $RT::MasonSessionDir )
-            if Apache->server->can('uid');
-        }
+        }} 
 
         # Die if WebSessionDir doesn't exist or we can't write to it
         stat($RT::MasonSessionDir);