projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.4.6
[freeside.git]
/
rt
/
lib
/
RT
/
Interface
/
Web
/
Handler.pm
diff --git
a/rt/lib/RT/Interface/Web/Handler.pm
b/rt/lib/RT/Interface/Web/Handler.pm
index
1e871ec
..
e41490f
100644
(file)
--- a/
rt/lib/RT/Interface/Web/Handler.pm
+++ b/
rt/lib/RT/Interface/Web/Handler.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-200
7
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-22,9
+22,7
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# 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., 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.
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
#
# CONTRIBUTION SUBMISSION POLICY:
#
#
# CONTRIBUTION SUBMISSION POLICY:
@@
-45,6
+43,7
@@
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
+
package RT::Interface::Web::Handler;
use CGI qw/-private_tempfiles/;
package RT::Interface::Web::Handler;
use CGI qw/-private_tempfiles/;
@@
-55,6
+54,7
@@
use Time::ParseDate;
use Time::HiRes;
use HTML::Entities;
use HTML::Scrubber;
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 );
use RT::Interface::Web::Handler;
use File::Path qw( rmtree );
use File::Glob qw( bsd_glob );
@@
-88,6
+88,16
@@
sub new {
$class->InitSessionDir;
if ( $mod_perl::VERSION && $mod_perl::VERSION >= 1.9908 ) {
$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) {
goto &NewApacheHandler;
}
elsif ($CGI::MOD_PERL) {
@@
-107,11
+117,12
@@
sub InitSessionDir {
# Clean up our umask to protect session files
umask(0077);
# Clean up our umask to protect session files
umask(0077);
- if ($CGI::MOD_PERL
) { local $@; eval
{
+ if ($CGI::MOD_PERL
and $CGI::MOD_PERL < 1.9908 )
{
chown( Apache->server->uid, Apache->server->gid,
$RT::MasonSessionDir )
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);
# Die if WebSessionDir doesn't exist or we can't write to it
stat($RT::MasonSessionDir);